diff -Naur src/Core/Banshee.Base/FileNamePattern.cs /src/Core/Banshee.Base/FileNamePattern.cs
--- src/Core/Banshee.Base/FileNamePattern.cs	2007-07-31 22:04:44.000000000 +0100
+++ src/Core/Banshee.Base/FileNamePattern.cs	2007-10-31 20:28:44.000000000 +0000
@@ -107,6 +107,11 @@
                 delegate(TrackInfo t, object r) {
                     return String.Format("{0:00}", t == null ? (uint)r : t.TrackNumber);
             });
+
+			AddConversion("genre", Catalog.GetString("Genre"),
+				delegate(Trackinfo t, object r) {
+					return Escape(t == null ? (string)r : t.DisplayGenre);
+			});
              
             AddConversion("track_count_nz", Catalog.GetString("Count (unsorted)"),  
                 delegate(TrackInfo t, object r) {
diff -Naur src/Core/Banshee.Base/TrackInfo.cs src/Core/Banshee.Base/TrackInfo.cs
--- src/Core/Banshee.Base/TrackInfo.cs	2007-07-31 22:04:45.000000000 +0100
+++ src/Core/Banshee.Base/TrackInfo.cs	2007-10-31 20:28:44.000000000 +0000
@@ -307,7 +307,15 @@
                     ? Catalog.GetString("Unknown Title") 
                     : title; 
             } 
-        }        
+        }       
+
+		public string DisplayGenre {
+			get {
+				return genre == null || genre == String.Empty
+					? Catalog.GetString("Unknown Genre")
+					: genre;
+			}
+		}
 
         public bool CanSaveToDatabase {
             get { return can_save_to_database; }
