=== modified file 'rhythmdb/rhythmdb.c'
--- rhythmdb/rhythmdb.c	2008-04-17 13:39:10 +0000
+++ rhythmdb/rhythmdb.c	2008-06-11 03:23:57 +0000
@@ -4626,7 +4626,12 @@
 	case RHYTHMDB_PROP_ALBUM_SORT_KEY:
 		return rb_refstring_get_sort_key (entry->album);
 	case RHYTHMDB_PROP_ARTIST_SORT_KEY:
+	{
+		const char *sortname_key;
+		sortname_key = rb_refstring_get_sort_key (entry->artist_sortname);
+		if (sortname_key[0]) return sortname_key;
 		return rb_refstring_get_sort_key (entry->artist);
+	}
 	case RHYTHMDB_PROP_GENRE_SORT_KEY:
 		return rb_refstring_get_sort_key (entry->genre);
 	case RHYTHMDB_PROP_TITLE_FOLDED:

