diff --git a/data/rhythmbox.schemas b/data/rhythmbox.schemas
index 1eb926b..0578cfc 100644
--- a/data/rhythmbox.schemas
+++ b/data/rhythmbox.schemas
@@ -1215,5 +1215,17 @@
 	  <long>The directory to store lyrics in</long>
 	</locale>
       </schema>
-    </schemalist>
+      <schema>
+      	<key>/schemas/apps/rhythmbox/plugins/artdisplay/image_names</key>
+	<applyto>/apps/rhythmbox/plugins/artdisplay/image_names</applyto>
+	<owner>rhythmbox</owner>
+	<type>list</type>
+	<list_type>string</list_type>
+	<default>[cover,album,albumart,.folder,folder,front]</default>
+	<locale name="C">
+	  <short>The list of image file prefixes to search for</short>
+	  <long>This list represents all the prefixes to search when looking for cover art in the same folder as an album.</long>
+	</locale>
+      </schema>
+   </schemalist>
 </gconfschemafile>
diff --git a/plugins/artdisplay/artdisplay/LocalCoverArtSearch.py b/plugins/artdisplay/artdisplay/LocalCoverArtSearch.py
index 5858d8c..e54e3cf 100644
--- a/plugins/artdisplay/artdisplay/LocalCoverArtSearch.py
+++ b/plugins/artdisplay/artdisplay/LocalCoverArtSearch.py
@@ -21,24 +21,44 @@ import rhythmdb
 import gnomevfs
 import rb
 import gobject
+import gconf
 
-IMAGE_NAMES = ["cover", "album", "albumart", ".folder", "folder"]
+IMAGE_NAMES_DEFAULT = ["cover", "album", "albumart", ".folder", "folder", "front"]
+IMAGE_NAMES = []
 LOAD_DIRECTORY_FLAGS = gnomevfs.FILE_INFO_GET_MIME_TYPE | gnomevfs.FILE_INFO_FORCE_FAST_MIME_TYPE
 ITEMS_PER_NOTIFICATION = 10
 ART_SAVE_NAME = 'Cover.jpg'
 ART_SAVE_FORMAT = 'jpeg'
 ART_SAVE_SETTINGS = {"quality": "100"}
+GCONF_KEY = '/apps/rhythmbox/plugins/artdisplay'
 
 def file_root (f_name):
 	return os.path.splitext (f_name)[0].lower ()
 
 class LocalCoverArtSearch:
 	def __init__ (self, loader):
+                global IMAGE_NAMES
 		self.loader = loader
+                client = gconf.client_get_default()
+                client.add_dir(GCONF_KEY, gconf.CLIENT_PRELOAD_NONE)
+                client.notify_add(GCONF_KEY + '/image_names',self._image_names_change)
+                IMAGE_NAMES = client.get_list(GCONF_KEY + '/image_names', gconf.VALUE_STRING)
+                if len(IMAGE_NAMES) == 0:
+                        print GCONF_KEY + '/image_names not set, setting to default.'
+                        IMAGE_NAMES = IMAGE_NAMES_DEFAULT
+                        client.set_list(GCONF_KEY + '/image_names', gconf.VALUE_STRING, IMAGE_NAMES)
 
+        def _image_names_change(self, client, *args, **kwargs):
+                global IMAGE_NAMES
+                print 'Image Names GConf Key Updated'
+                IMAGE_NAMES = client.get_list(GCONF_KEY + '/image_names', gconf.VALUE_STRING)
+                if len(IMAGE_NAMES) == 0:
+                        IMAGE_NAMES = IMAGE_NAMES_DEFAULT
+                
 	def _load_dir_cb (self, handle, files, exception, (results, on_search_completed_cb, entry, args)):
 		for f in files:
 			if f.mime_type.startswith ("image/") and f.permissions & gnomevfs.PERM_USER_READ:
+                                print "Going to test: " + f.name
 				results.append (f.name)
 		if exception:
 			on_search_completed_cb (self, entry, results, *args)
@@ -64,11 +84,10 @@ class LocalCoverArtSearch:
 		return False
 
 	def get_best_match_urls (self, results):
-		# Compare lower case, without file extension
-		for name in [file_root (self.uri.short_name)] + IMAGE_NAMES:
-			for f_name in results:
-				if file_root (f_name) == name:
-					yield self.uri.parent.append_file_name (f_name).path
+                for result in results:
+                        for name in IMAGE_NAMES:
+                                if name == file_root(result):
+                                        yield self.uri.parent.append_file_name (result).path
 
 	def pixbuf_save (self, plexer, pixbuf, uri):
 		gnomevfs.async.create (uri, plexer.send (), gnomevfs.OPEN_WRITE | gnomevfs.OPEN_TRUNCATE, False, 0644, gnomevfs.PRIORITY_DEFAULT)
