diff --git a/packages/network/bluez/build b/packages/network/bluez/build
index d0f9b4b454..3f52167696 100755
--- a/packages/network/bluez/build
+++ b/packages/network/bluez/build
@@ -2,12 +2,12 @@
 
 . config/options
 
-if [ $DEBUG = yes ]; then
+if [ "$DEBUG" = "yes" ]; then
   DEBUG_CONFIG="--enable-debug"
 else
   DEBUG_CONFIG="--disable-debug"
 fi
-if [ $DEVTOOLS = yes ]; then
+if [ "$DEVTOOLS" = "yes" ]; then
   DEVTOOLS_CONFIG="--enable-bccmd --enable-test --enable-tools"
 else
   DEVTOOLS_CONFIG="--disable-bccmd --disable-test --disable-tools"
diff --git a/packages/network/bluez/install b/packages/network/bluez/install
index eb751ed838..4f3ddab6f2 100755
--- a/packages/network/bluez/install
+++ b/packages/network/bluez/install
@@ -21,7 +21,7 @@ mkdir -p $INSTALL/lib/udev/rules.d
   cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/lib/udev/rules.d
   cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/lib/udev/rules.d
 
-if [ $DEVTOOLS = yes ]; then
+if [ "$DEVTOOLS" = "yes" ]; then
   mkdir -p $INSTALL/usr/bin
     cp $PKG_BUILD/tools/.libs/ciptool $INSTALL/usr/bin
     cp $PKG_BUILD/tools/.libs/hcitool $INSTALL/usr/bin
@@ -32,6 +32,13 @@ if [ $DEVTOOLS = yes ]; then
     cp $PKG_BUILD/compat/.libs/hidd  $INSTALL/usr/bin
     cp $PKG_BUILD/test/.libs/l2test $INSTALL/usr/bin
     cp $PKG_BUILD/test/.libs/rctest $INSTALL/usr/bin
+
+mkdir -p $INSTALL/usr/sbin
+  cp $PKG_BUILD/tools/.libs/bccmd $INSTALL/usr/sbin # TODO
+  cp $PKG_BUILD/tools/.libs/hciattach $INSTALL/usr/sbin
+  cp $PKG_BUILD/tools/.libs/hciconfig $INSTALL/usr/sbin
+  cp $PKG_BUILD/tools/hid2hci $INSTALL/usr/sbin
+  cp $PKG_BUILD/test/.libs/hciemu $INSTALL/usr/sbin
 fi
 
 mkdir -p $INSTALL/usr/lib
@@ -45,9 +52,4 @@ mkdir -p $INSTALL/usr/lib/bluetooth/plugins
 
 mkdir -p $INSTALL/usr/sbin
   cp $PKG_BUILD/src/.libs/bluetoothd $INSTALL/usr/sbin
-  cp $PKG_BUILD/tools/.libs/bccmd $INSTALL/usr/sbin
-  cp $PKG_BUILD/tools/.libs/hciattach $INSTALL/usr/sbin
-  cp $PKG_BUILD/tools/.libs/hciconfig $INSTALL/usr/sbin
-  cp $PKG_BUILD/test/.libs/hciemu $INSTALL/usr/sbin
-  cp $PKG_BUILD/tools/hid2hci $INSTALL/usr/sbin