diff --git a/NEWS b/NEWS
index 991f475d0..793e8150f 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ ver 0.17 (2011/??/??)
   - shout: add possibility to set url
   - roar: new output plugin for RoarAudio
 * state_file: add option "restore_paused"
+* cue: show CUE track numbers
 
 
 ver 0.16.3 (2011/??/??)
diff --git a/src/cue/cue_tag.c b/src/cue/cue_tag.c
index ba1172559..6ee38bbd0 100644
--- a/src/cue/cue_tag.c
+++ b/src/cue/cue_tag.c
@@ -178,6 +178,15 @@ cue_tag(struct Cd *cd, unsigned tnum)
 	if (tag == NULL)
 		return NULL;
 
+	/* Create a tag number */
+
+	tag_clear_items_by_type(tag, TAG_TRACK);
+
+	char convert_uinttostring[8];
+	snprintf(convert_uinttostring, sizeof(convert_uinttostring),
+		 "%02d/%02d", tnum, cd_get_ntrack(cd));
+	tag_add_item(tag, TAG_TRACK, convert_uinttostring);
+
 	tag->time = track_get_length(track)
 	    - track_get_index(track, 1)
 	    + track_get_zero_pre(track);