--- CUE.pm	Fri Nov 27 16:36:05 2009
+++ CUE.pm.10027	Sat Nov 28 00:54:04 2009
@@ -69,7 +69,8 @@
 
 			$cuesheet->{'ARTIST'} = $1;
 
-		} elsif ($line =~ /^(?:REM\s+)?(YEAR|GENRE|DISC|DISCC|COMMENT)\s+\"(.*)\"/i) {
+                # Bug 10027 - FLAC external cuesheet ARTISTSORT ignored
+		} elsif ($line =~ /^(?:REM\s+)?(YEAR|GENRE|DISC|DISCC|COMMENT|ARTISTSORT|ALBUMSORT|COMPILATION)\s+\"(.*)\"/i) {
 
 			$cuesheet->{uc($1)} = $2;
 
@@ -201,7 +202,8 @@
 
 		# Also - check the original file for any information that may
 		# not be in the cue sheet. Bug 2668
-		for my $attribute (qw(ARTIST ALBUM YEAR GENRE REPLAYGAIN_ALBUM_GAIN REPLAYGAIN_ALBUM_PEAK)) {
+                # Bug 10027 - FLAC external cuesheet ARTISTSORT ignored
+		for my $attribute (qw(ARTIST ALBUM YEAR GENRE REPLAYGAIN_ALBUM_GAIN REPLAYGAIN_ALBUM_PEAK ARTISTSORT ALBUMSORT COMPILATION)) {
 
 			if (!$cuesheet->{$attribute}) {
 
@@ -273,7 +275,8 @@
 		}
 
 		# Merge in file level attributes
-		for my $attribute (qw(ARTIST ALBUM YEAR GENRE COMMENT REPLAYGAIN_ALBUM_GAIN REPLAYGAIN_ALBUM_PEAK)) {
+                # Bug 10027 - FLAC external cuesheet ARTISTSORT ignored
+		for my $attribute (qw(ARTIST ALBUM YEAR GENRE COMMENT REPLAYGAIN_ALBUM_GAIN REPLAYGAIN_ALBUM_PEAK ARTISTSORT ALBUMSORT ARTWORK COMPILATION)) {
 
 			if (!exists $track->{$attribute} && defined $cuesheet->{$attribute}) {