diff -ur src.orig/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs
--- src.orig/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs	2008-08-04 14:50:36.000000000 -0300
+++ src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs	2008-12-13 18:15:53.000000000 -0400
@@ -88,6 +88,12 @@
                 delegate (ITrackInfo t, object r) {
                     return Escape (t == null ? (string)r : t.DisplayArtistName);
             });
+
+            AddConversion ("album_artist", Catalog.GetString ("Album Artist"),
+                delegate (ITrackInfo t, object r) {
+                    TrackInfo ti = t as TrackInfo;
+                    return Escape (ti == null ? (string)r : ti.AlbumArtist);
+            });
                         
             AddConversion ("genre", Catalog.GetString ("Genre"),  
                 delegate (ITrackInfo t, object r) {
@@ -98,6 +104,12 @@
                 delegate (ITrackInfo t, object r) {
                     return Escape (t == null ? (string)r : t.DisplayAlbumTitle);
             });
+
+            AddConversion ("disc", Catalog.GetString ("Disc"),
+                delegate (ITrackInfo t, object r) {
+                    TrackInfo ti = t as TrackInfo;
+                    return String.Format ("{0}", t == null ? (int)r : ti.DiscNumber);
+            });
             
             AddConversion ("title", Catalog.GetString ("Title"),  
                 delegate (ITrackInfo t, object r) {
@@ -140,11 +152,11 @@
         }
         
         public static string DefaultFolder {
-            get { return "%artist%%path_sep%%album%"; }
+            get { return "%album_artist%%path_sep%(%year%) %album%"; }
         }
         
         public static string DefaultFile {
-            get { return "%track_number%. %title%"; }
+            get { return "%disc%-%track_number% %title%"; }
         }
         
         public static string DefaultPattern {
@@ -153,6 +165,7 @@
         
         private static string [] suggested_folders = new string [] {
             DefaultFolder,
+            "%artist%%path_sep%%album%",
             "%artist%%path_sep%%artist% - %album%",
             "%artist%%path_sep%%album% (%year%)",
             "%artist% - %album%",
@@ -166,6 +179,7 @@
     
         private static string [] suggested_files = new string [] {
             DefaultFile,
+            "%track_number%. %title%",
             "%track_number%. %artist% - %title%",
             "%artist% - %title%",
             "%artist% - %track_number% - %title%",
