Index: server/Slim/Plugin/iTunes/Common.pm
===================================================================
--- server/Slim/Plugin/iTunes/Common.pm	(revision 30349)
+++ server/Slim/Plugin/iTunes/Common.pm	(working copy)
@@ -408,8 +410,20 @@
 		$prefs->set('lastITunesMusicLibraryDate',0);
 	}
 
-	if (!defined $prefs->get('itunes') && defined $class->findMusicLibraryFile()) {
-		$prefs->set('itunes', 1);
+	if (!defined $prefs->get('itunes')) {
+		require Slim::Utils::OSDetect;
+
+		# disable iTunes unless
+		# - an iTunes XML file is found
+		# - or we're on a Mac
+		# - or we're running Windows (but not Windows Home Server)
+		if (defined $class->findMusicLibraryFile() || main::ISMAC 
+				|| (main::ISWINDOWS && !Slim::Utils::OSDetect->getOS()->get('isWHS'))) {
+			$prefs->set('itunes', 1);
+		}
+		else {
+			$prefs->set('itunes', 0);
+		}
 	}
 	
 	if (!defined $prefs->get('ignore_playlists')) {
Index: server/Slim/Plugin/iTunes/Plugin.pm
===================================================================
--- server/Slim/Plugin/iTunes/Plugin.pm	(revision 30349)
+++ server/Slim/Plugin/iTunes/Plugin.pm	(working copy)
@@ -103,9 +103,6 @@
 		return;
 	}
 
-	# default to on if not previously set
-	$prefs->set('itunes', 1) unless defined $prefs->get('itunes');
-
 	Slim::Player::ProtocolHandlers->registerHandler('itunesplaylist', 0);
 
 	$class->initialized(1);