diff -urN slimserver.old/Plugins/iTunes.pm slimserver/Plugins/iTunes.pm
--- slimserver.old/Plugins/iTunes.pm	2005-09-11 22:52:11.000000000 -0400
+++ slimserver/Plugins/iTunes.pm	2005-09-15 00:06:22.000000000 -0400
@@ -1223,7 +1223,7 @@
 		,'GroupOrder' => ['Default','iTunesPlaylistFormat']
 		,'Groups' => {
 			'Default' => {
-					'PrefOrder' => ['itunesscaninterval','ignoredisableditunestracks','itunes_library_autolocate','itunes_library_xml_path','itunes_library_music_path']
+					'PrefOrder' => ['itunesscaninterval','ignoredisableditunestracks']
 				}
 			,'iTunesPlaylistFormat' => {
 					'PrefOrder' => ['iTunesplaylistprefix','iTunesplaylistsuffix']
diff -urN slimserver.old/Slim/Player/Source.pm slimserver/Slim/Player/Source.pm
--- slimserver.old/Slim/Player/Source.pm	2005-09-11 22:52:11.000000000 -0400
+++ slimserver/Slim/Player/Source.pm	2005-09-24 20:41:42.000000000 -0400
@@ -1369,7 +1369,9 @@
 				return undef;
 			}
 
-			if (!$size || !$duration) {
+			# This is an upstream problem with how they implemented the logic:
+			# if (!$size || !$duration) {
+			if (((defined($size)) && (!$size)) || ((defined($duration)) && (!$duration))) {
 
 				$::d_source && msg("openSong: not bothering opening file with zero size or duration\n");
 				errorOpening($client);
diff -urN slimserver.old/Slim/Web/Setup.pm slimserver/Slim/Web/Setup.pm
--- slimserver.old/Slim/Web/Setup.pm	2005-09-11 22:52:11.000000000 -0400
+++ slimserver/Slim/Web/Setup.pm	2005-09-15 00:08:53.000000000 -0400
@@ -1209,7 +1209,7 @@
 						'PrefOrder' => ['language']
 						},
 				'Default' => {
-						'PrefOrder' => ['audiodir','playlistdir',undef]
+						'PrefOrder' => [undef]
 						},
 				'Rescan' => {
 					'PrefOrder' => [qw(playlistrescan wipedb rescan)]
@@ -1395,9 +1395,7 @@
 		,'GroupOrder' => ['Default']
 		,'Groups' => {
 			'Default' => {
-					'PrefOrder' => ['skin','itemsPerPage','refreshRate','coverArt','coverThumb',
-					#'artfolder',
-					'thumbSize','includeNoArt']
+					'PrefOrder' => ['skin','itemsPerPage','refreshRate','coverArt','coverThumb','thumbSize','includeNoArt']
 				}
 			}
 		,'Prefs' => {
diff -urN slimserver.old/slimserver.pl slimserver/slimserver.pl
--- slimserver.old/slimserver.pl	2005-09-14 23:48:16.000000000 -0400
+++ slimserver/slimserver.pl	2005-09-15 00:09:57.000000000 -0400
@@ -965,8 +965,6 @@
 
 	open(STDOUT, $logfilename) || die "Can't write to $logfilename: $!";
 
-	$0 = "slimserver";
-
 	if (!setsid) { die "Can't start a new session: $!"; }
 	if (!open STDERR, '>&STDOUT') { die "Can't dup stdout: $!"; }
 }
diff -urN slimserver.old/strings.txt slimserver/strings.txt
--- slimserver.old/strings.txt	2005-09-11 22:52:11.000000000 -0400
+++ slimserver/strings.txt	2005-09-15 00:23:07.000000000 -0400
@@ -3810,7 +3810,7 @@
 
 SETUP_IGNOREDISABLEDITUNESTRACKS_1
 	DE	Deaktivierte Musikstücke ignorieren
-	EN	Ignore songs unchecked in iTunes
+	EN	Import all songs from iTunes
 	ES	Ignorar canciones no marcadas en iTunes 
 	FR	Ignorer les morceaux désactivés dans iTunes
 	JP	iTunesで再生しないように設定された曲を無視する
@@ -3819,7 +3819,7 @@
 
 SETUP_IGNOREDISABLEDITUNESTRACKS_0
 	DE	Deaktivierte Musikstücke anzeigen
-	EN	Don't ignore songs unchecked in iTunes
+	EN	Import only checked songs from iTunes
 	ES	No ignorar canciones no marcadas en iTunes 
 	FR	Ne pas ignorer les morceaux désactivés dans iTunes
 	JP	iTunesで再生しないように設定された曲を有効にする