Index: Slim/DataStores/DBI/ContributorTrack.pm
===================================================================
--- Slim/DataStores/DBI/ContributorTrack.pm	(revision 3036)
+++ Slim/DataStores/DBI/ContributorTrack.pm	(working copy)
@@ -78,13 +78,19 @@
 
 			$artistObj = $_cache{$name};
 
+			# If we had an explicitly specified sort tag, modify
+			# the existing object.
+			if ($artist ne $artistSort) {
+				$artistObj->namesort($sort);
+			}
+
 		} else {
 
 			$artistObj = Slim::DataStores::DBI::Contributor->find_or_create({ 
-				namesort => $sort,
+				name => $name,
 			});
 
-			$artistObj->name($name);
+			$artistObj->namesort($sort);
 			$artistObj->update();
 
 			# Try to prevent leaks and circular references.