diff --git a/src/tools/cuetag.sh b/src/tools/cuetag.sh
index 922ba69..09d7e9d 100755
--- a/src/tools/cuetag.sh
+++ b/src/tools/cuetag.sh
@@ -64,8 +64,8 @@ vorbis()
 	TITLE='%t'
 	VERSION=''
 	ALBUM='%T'
-	TRACKNUMBER='%n'
-	TRACKTOTAL='%N'
+	TRACKNUMBER='%02n'
+	TRACKTOTAL='%02N'
 	ARTIST='%c %p'
 	PERFORMER='%p'
 	COPYRIGHT=''