diff --git a/src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs b/src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs
index 2a15c9f..59f52e8 100644
--- a/src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs
+++ b/src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs
@@ -141,6 +141,11 @@ namespace Banshee.Base
                 delegate (ITrackInfo t, object r) {
                     return String.Format ("{0}", t == null ? (int)r : t.TrackNumber);
             });
+
+			 AddConversion ("disc_number", Catalog.GetString ("Disc Number"),
+				 delegate (ITrackInfo t, object r) {
+					 return String.Format ("{0} {1}", Catalog.GetString ("Disc"), t == null ? (int)r : t.DiscNumber);
+			 });
             
             AddConversion ("path_sep", Path.DirectorySeparatorChar.ToString (),
                 delegate (ITrackInfo t, object r) {
@@ -166,6 +171,7 @@ namespace Banshee.Base
         
         private static string [] suggested_folders = new string [] {
             DefaultFolder,
+			 "%album_artist%%path_sep%%album%%path_sep%%disc_number%",
             "%album_artist%%path_sep%%album_artist% - %album%",
             "%album_artist%%path_sep%%album% (%year%)",
             "%album_artist% - %album%",
diff --git a/src/Core/Banshee.Core/Banshee.Collection/ITrackInfo.cs b/src/Core/Banshee.Core/Banshee.Collection/ITrackInfo.cs
index 150a02b..ca02fc3 100644
--- a/src/Core/Banshee.Core/Banshee.Collection/ITrackInfo.cs
+++ b/src/Core/Banshee.Core/Banshee.Collection/ITrackInfo.cs
@@ -43,5 +43,6 @@ namespace Banshee.Collection
         int TrackCount { get; }
         int Year { get; }
         int Rating { get; }
+		 int DiscNumber { get; }
     }
 }
