Index: Slim/Utils/OSDetect.pm
===================================================================
--- Slim/Utils/OSDetect.pm	(revision 6122)
+++ Slim/Utils/OSDetect.pm	(working copy)
@@ -102,7 +102,7 @@
 	# Debian specific paths.
 	} elsif (isDebian()) {
 
-		if ($dir =~ /^(?:Firmware|Graphics|HTML|IR|SQL|lib)$/) {
+		if ($dir =~ /^(?:Firmware|Graphics|HTML|IR|SQL|lib|Bin)$/) {
 
 			push @dirs, "/usr/share/slimserver/$dir";
 
Index: Slim/Utils/Misc.pm
===================================================================
--- Slim/Utils/Misc.pm	(revision 6122)
+++ Slim/Utils/Misc.pm	(working copy)
@@ -55,11 +55,7 @@
 	   $arch =~ s/^i[3456]86-([^-]+).*$/i386-$1/;
 
 	my $path;
-	my @paths = (
-		catdir($Bin, 'Bin', $arch),
-		catdir($Bin, 'Bin', $^O),
-		catdir($Bin, 'Bin'),
-	);
+	my @paths = Slim::Utils::OSDetect::dirsFor('Bin');
 
 	if (Slim::Utils::OSDetect::OS() eq 'mac') {
 		push @paths, $ENV{'HOME'} . "/Library/SlimDevices/bin/";