Index: Plugins/iTunes/Importer.pm
===================================================================
--- Plugins/iTunes/Importer.pm	(revision 12394)
+++ Plugins/iTunes/Importer.pm	(working copy)
@@ -361,7 +361,14 @@
 		$cacheEntry{'GENRE'} = $curTrack->{'Genre'};
 		$cacheEntry{'FS'}    = $curTrack->{'Size'};
 
-		if ($curTrack->{'Total Time'}) {
+		# iTunes 7.??? adds support for sort fields
+		$cacheEntry{'TITLESORT'} = $curTrack->{'Sort Name'} if $curTrack->{'Sort Name'};
+		$cacheEntry{'ARTISTSORT'} = $curTrack->{'Sort Artist'} if $curTrack->{'Sort Artist'};
+		$cacheEntry{'ALBUMARTISTSORT'} = $curTrack->{'Sort Album Artist'} if $curTrack->{'Sort Album Artist'};
+		$cacheEntry{'ALBUMSORT'} = $curTrack->{'Sort Album'} if $curTrack->{'Sort Album'};
+		$cacheEntry{'COMPOSERSORT'} = $curTrack->{'Sort Composer'} if $curTrack->{'Sort Composer'};
+
+	if ($curTrack->{'Total Time'}) {
 			$cacheEntry{'SECS'} = $curTrack->{'Total Time'} / 1000;
 		}
 
Index: Slim/Schema.pm
===================================================================
--- Slim/Schema.pm	(revision 12394)
+++ Slim/Schema.pm	(working copy)
@@ -1682,11 +1682,11 @@
 		$attributes->{'LYRICS'} = join("\n", @{$attributes->{'LYRICS'}});
 	}
 
-	# Normalize ARTISTSORT in Contributor->add() the tag may need to be split. See bug #295
+	# Normalize ARTISTSORT etc. in Contributor->add() the tag may need to be split. See bug #295
 	#
 	# Push these back until we have a Track object.
-	for my $tag (Slim::Schema::Contributor->contributorRoles, qw(
-		COMMENT GENRE ARTISTSORT PIC APIC ALBUM ALBUMSORT DISCC
+	for my $tag ( ( map {($_, $_."SORT")} Slim::Schema::Contributor->contributorRoles), qw(
+		COMMENT GENRE PIC APIC ALBUM ALBUMSORT DISCC
 		COMPILATION REPLAYGAIN_ALBUM_PEAK REPLAYGAIN_ALBUM_GAIN 
 		MUSICBRAINZ_ARTIST_ID MUSICBRAINZ_ALBUM_ARTIST_ID MUSICBRAINZ_ALBUM_ID 
 		MUSICBRAINZ_ALBUM_TYPE MUSICBRAINZ_ALBUM_STATUS