Index: Slim/Music/Artwork.pm
===================================================================
--- Slim/Music/Artwork.pm	(revision 13013)
+++ Slim/Music/Artwork.pm	(working copy)
@@ -128,13 +128,26 @@
 
 	my $url  = Slim::Utils::Misc::stripAnchorFromURL($track->url);
 	my $file = $track->path;
+	
+	my ($body, $contentType, $path);
 
-	# Try to read a cover image from the tags first.
-	my ($body, $contentType, $path) = $class->_readCoverArtTags($track, $file);
+	if (Slim::Utils::Prefs::get('coverPreferFile')){
+		# Try to read a cover image from file system first.
+		($body, $contentType, $path) = $class->_readCoverArtFiles($track, $file, $image);
+	}else{
+		# Try to read a cover image from the tags first.
+		($body, $contentType, $path) = $class->_readCoverArtTags($track, $file);
+	}
 
-	# Nothing there? Look on the file system.
+	# Nothing there? Try the other option.
 	if (!defined $body) {
-		($body, $contentType, $path) = $class->_readCoverArtFiles($track, $file, $image);
+		if (Slim::Utils::Prefs::get('coverPreferFile')){
+			# Try to read a cover image from the tags.
+			($body, $contentType, $path) = $class->_readCoverArtTags($track, $file);
+		}else{
+			# Try to read a cover image from file system.
+			($body, $contentType, $path) = $class->_readCoverArtFiles($track, $file, $image);
+		}
 	}
 
 	return ($body, $contentType, $path);
Index: Slim/Utils/Prefs.pm
===================================================================
--- Slim/Utils/Prefs.pm	(revision 13013)
+++ Slim/Utils/Prefs.pm	(working copy)
@@ -161,6 +161,7 @@
 		'artfolder'		=> '',
 		'coverThumb'		=> '',
 		'coverArt'		=> '',
+		'coverPreferFile' => 0,
 		'thumbSize'		=> 100,
 		'itemsPerPass'		=> 5,
 		'plugins-onthefly'	=> 0,