diff --git a/data/interfaces/brink/config.html b/data/interfaces/brink/config.html
index 55ffde67..dec8e0a7 100644
--- a/data/interfaces/brink/config.html
+++ b/data/interfaces/brink/config.html
@@ -548,7 +548,7 @@
 						</tr>
 						<tr>
 							<td><label for="file_format">File Format:</label>
-									<small>Use: $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year</small>
+									<small>Use: $Disc/$disc (disc #), $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year</small>
 							</td>
 							<td><input type="text" name="file_format" value="${config['file_format']}" size="43" /></td>
 						</tr>
diff --git a/data/interfaces/classic/config.html b/data/interfaces/classic/config.html
index 9a5e92a3..88f6554e 100644
--- a/data/interfaces/classic/config.html
+++ b/data/interfaces/classic/config.html
@@ -319,7 +319,7 @@
                     <br><br>
                     <h3>File Format:</h3><input type="text" name="file_format" value="${config['file_format']}" size="43">
                       <br>
-                      <i class="smalltext">Use: $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year</i>
+                      <i class="smalltext">Use: $Disc/$disc (disc #), $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year</i>
                 </td>
                 <td>
                       <h2>Miscellaneous:</h2>
diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index 95d3e2e7..9b500a1a 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -414,7 +414,7 @@
                 		 <div class="row">
                 		  	<label>File Format</label>
                 		  	<input type="text" name="file_format" value="${config['file_format']}" size="43">
-                		   	<small>Use: $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year</small>
+                		   	<small>Use: $Disc/$disc (disc #), $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year</small>
                 		</div>
                 	</fieldset>
                 	
diff --git a/data/interfaces/remix/config.html b/data/interfaces/remix/config.html
index 9a5e92a3..88f6554e 100644
--- a/data/interfaces/remix/config.html
+++ b/data/interfaces/remix/config.html
@@ -319,7 +319,7 @@
                     <br><br>
                     <h3>File Format:</h3><input type="text" name="file_format" value="${config['file_format']}" size="43">
                       <br>
-                      <i class="smalltext">Use: $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year</i>
+                      <i class="smalltext">Use: $Disc/$disc (disc #), $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year</i>
                 </td>
                 <td>
                       <h2>Miscellaneous:</h2>
diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py
index c3f8ac18..dae5e581 100644
--- a/headphones/postprocessor.py
+++ b/headphones/postprocessor.py
@@ -754,7 +754,13 @@ def renameFiles(albumpath, downloaded_track_list, release):
         except:
             logger.info("MediaFile couldn't parse: " + downloaded_track.decode(headphones.SYS_ENCODING, 'replace'))
             continue
-            
+    
+	if not f.
+        if not f.disc:
+			discnumber = ''
+		else:
+			discnumber = f.disc
+				
         if not f.track:
             tracknumber = ''
         else:
@@ -771,7 +777,8 @@ def renameFiles(albumpath, downloaded_track_list, release):
         else:
             title = f.title
             
-            values = {  '$Track':       tracknumber,
+            values = {  '$Disc':		discnumber,
+						'$Track':       tracknumber,
                         '$Title':       title,
                         '$Artist':      release['ArtistName'],
                         '$Album':       release['AlbumTitle'],