diff -u -r banshee-1-1.0.0/src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs banshee-1-1.0.0.work/src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs
--- banshee-1-1.0.0/src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs	2008-05-29 17:47:34.000000000 -0500
+++ banshee-1-1.0.0.work/src/Core/Banshee.Core/Banshee.Base/FileNamePattern.cs	2008-06-29 14:29:18.000000000 -0500
@@ -88,7 +88,12 @@
                 delegate (ITrackInfo t, object r) {
                     return Escape (t == null ? (string)r : t.DisplayArtistName);
             });
-            
+                        
+            AddConversion ("genre", Catalog.GetString ("Genre"),  
+                delegate (ITrackInfo t, object r) {
+                    return Escape (t == null ? (string)r : t.DisplayGenre);
+            });
+
             AddConversion ("album", Catalog.GetString ("Album"),  
                 delegate (ITrackInfo t, object r) {
                     return Escape (t == null ? (string)r : t.DisplayAlbumTitle);
diff -u -r banshee-1-1.0.0/src/Core/Banshee.Core/Banshee.Collection/ITrackInfo.cs banshee-1-1.0.0.work/src/Core/Banshee.Core/Banshee.Collection/ITrackInfo.cs
--- banshee-1-1.0.0/src/Core/Banshee.Core/Banshee.Collection/ITrackInfo.cs	2007-11-01 10:08:14.000000000 -0500
+++ banshee-1-1.0.0.work/src/Core/Banshee.Core/Banshee.Collection/ITrackInfo.cs	2008-06-29 14:30:42.000000000 -0500
@@ -36,6 +36,7 @@
         string DisplayArtistName { get; }
         string DisplayAlbumTitle { get; }
         string DisplayTrackTitle { get; }
+        string DisplayGenre { get; }
         
         int TrackNumber { get; }
         int TrackCount { get; }
diff -u -r banshee-1-1.0.0/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs banshee-1-1.0.0.work/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs
--- banshee-1-1.0.0/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs	2008-05-27 13:41:42.000000000 -0500
+++ banshee-1-1.0.0.work/src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs	2008-06-29 14:29:08.000000000 -0500
@@ -195,6 +195,16 @@
                     : title; 
             } 
         }     
+
+        public string DisplayGenre { 
+            get { 
+                string genre = Genre == null ? null : Genre.Trim ();
+                return String.IsNullOrEmpty (genre) 
+                    ? Catalog.GetString ("Unknown Genre") 
+                    : genre; 
+            } 
+        }     
+        
         
         public virtual string ArtworkId { 
             get { return CoverArtSpec.CreateArtistAlbumId (ArtistName, AlbumTitle); }
