diff --git a/whipper/common/program.py b/whipper/common/program.py
index 56c39d01..934c2aed 100644
--- a/whipper/common/program.py
+++ b/whipper/common/program.py
@@ -222,8 +222,8 @@ def getPath(self, outdir, template, mbdiscid, metadata, track_number=None):
             v['B'] = metadata.barcode
             v['C'] = metadata.catalogNumber
             v['c'] = metadata.releaseDisambCmt
-            v['M'] = metadata.discTotal
-            v['N'] = metadata.discNumber
+            v['M'] = '%02d' % (metadata.discTotal or 0)
+            v['N'] = '%02d' % (metadata.discNumber or 1)
             v['T'] = metadata.mediumTitle
             if metadata.releaseType:
                 v['R'] = metadata.releaseType