Index: server/Slim/Schema.pm
===================================================================
--- server/Slim/Schema.pm	(revision 15693)
+++ server/Slim/Schema.pm	(working copy)
@@ -2309,6 +2309,19 @@
 		return;
 	}
 
+        # Bug 6490: actually transform the BAND tags to ALBUMARTIST when
+        # the useBandAsAlbumArtist option is set.
+        if ($prefs->get('useBandAsAlbumArtist') &&
+            $attributes->{'BAND'} &&
+            !$attributes->{'ALBUMARTIST'}) {
+
+            $attributes->{'ALBUMARTIST'} = delete $attributes->{'BAND'};
+            $attributes->{'ALBUMARTISTSORT'} = delete $attributes->{'BANDSORT'};
+
+            $log->debug(sprintf("-- Contributor '%s' of role 'BAND' transformed to role 'ALBUMARTIST'\n",
+                                $attributes->{'ALBUMARTIST'}));
+        }
+
 	# Bug: 2317 & 2638
 	#
 	# Bring back the TRACKARTIST role.
@@ -2321,6 +2334,7 @@
 		if ($attributes->{'ARTIST'} && $attributes->{'ALBUMARTIST'}) {
 
 			$attributes->{'TRACKARTIST'} = delete $attributes->{'ARTIST'};
+			$attributes->{'TRACKARTISTSORT'} = delete $attributes->{'ARTISTSORT'};
 
 			$log->debug(sprintf("-- Contributor '%s' of role 'ARTIST' transformed to role 'TRACKARTIST'",
 				$attributes->{'TRACKARTIST'},