diff --git a/src/tools/cuetag.sh b/src/tools/cuetag.sh
index 722cbae..5be8768 100755
--- a/src/tools/cuetag.sh
+++ b/src/tools/cuetag.sh
@@ -77,8 +77,8 @@ vorbis()
 	LICENSE=''
 	ORGANIZATION=''
 	DESCRIPTION='%m'
-	GENRE='%g'
-	DATE='%d'
+	GENRE='%G'
+	DATE='%D'
 	LOCATION=''
 	CONTACT=''
 	ISRC='%i %u'
@@ -121,9 +121,9 @@ id3()
 	TITLE='%t'
 	ALBUM='%T'
 	ARTIST='%p'
-	YEAR='%d'
+	YEAR='%D'
 	COMMENT='%c'
-	GENRE='%g'
+	GENRE='%G'
 	TRACKNUMBER='%n'
 
 	for field in $fields; do