Index: server/Slim/Music/Import.pm
===================================================================
--- server/Slim/Music/Import.pm	(revision 16989)
+++ server/Slim/Music/Import.pm	(working copy)
@@ -135,17 +135,14 @@
 
 		$command  = "$Bin/scanner.exe";
 
-	} elsif (-x '/usr/libexec/squeezecenter-scanner') {
+	} elsif (Slim::Utils::OSDetect::isRHorSUSE()) {
 
 		$command  = '/usr/libexec/squeezecenter-scanner';
 
-	} elsif (-x '/usr/sbin/squeezecenter-scanner') {
+	} elsif (Slim::Utils::OSDetect::isDebian()) {
 
 		$command  = '/usr/sbin/squeezecenter-scanner';
 
-	} elsif (-x '/usr/sbin/slimserver-scanner') {
-
-		$command  = '/usr/sbin/slimserver-scanner';
 	}
 
 	# Bug: 3530 - use the same version of perl we were started with.
Index: server/Slim/Utils/OSDetect.pm
===================================================================
--- server/Slim/Utils/OSDetect.pm	(revision 16989)
+++ server/Slim/Utils/OSDetect.pm	(working copy)
@@ -451,7 +451,7 @@
 	my $OS      = OS();
 	my $details = details();
 
-	if (($details->{'osName'} eq 'Red Hat' || $details->{'osName'} eq 'SUSE') && -d '/usr/share/squeezecenter/Firmware') {
+	if (($details->{'osName'} eq 'Red Hat' || $details->{'osName'} eq 'SUSE') && $0 =~ m{^/usr/libexec/squeezecenter} ) {
 		return 1;
 	}