diff --git a/packages/network/bluez/build b/packages/network/bluez/build
index 133e8152f3..1c9f9c300c 100755
--- a/packages/network/bluez/build
+++ b/packages/network/bluez/build
@@ -31,7 +31,7 @@ fi
 if [ "$DEVTOOLS" = "yes" ]; then
   DEVTOOLS_CONFIG="--enable-monitor --enable-test --enable-tools"
 else
-  DEVTOOLS_CONFIG="--disable-monitor --disable-test --enable-tools"
+  DEVTOOLS_CONFIG="--disable-monitor --disable-test --disable-tools"
 fi
 
 cd $PKG_BUILD
diff --git a/packages/network/bluez/install b/packages/network/bluez/install
index 70ab26b61c..61218f9d25 100755
--- a/packages/network/bluez/install
+++ b/packages/network/bluez/install
@@ -25,45 +25,35 @@
 mkdir -p $INSTALL/etc/dbus-1/system.d
   cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d
 
-mkdir -p $INSTALL/usr/lib/bluetooth
-  cp $PKG_BUILD/src/bluetoothd $INSTALL/usr/lib/bluetooth
-  cp $PKG_BUILD/obexd/src/obexd $INSTALL/usr/lib/bluetooth
+mkdir -p $INSTALL/lib/udev
+  cp $PKG_BUILD/tools/hid2hci $INSTALL/lib/udev
+
+mkdir -p $INSTALL/lib/udev/rules.d
+  cp $PKG_BUILD/tools/97-hid2hci.rules $INSTALL/lib/udev/rules.d
 
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib
 
-# client
-  mkdir -p $INSTALL/usr/bin
-    cp $PKG_BUILD/client/bluetoothctl $INSTALL/usr/bin
-
-# tools
-  mkdir -p $INSTALL/lib/udev
-    cp $PKG_BUILD/tools/hid2hci $INSTALL/lib/udev
-
-  mkdir -p $INSTALL/lib/udev/rules.d
-    cp $PKG_BUILD/tools/97-hid2hci.rules $INSTALL/lib/udev/rules.d
-
-  mkdir -p $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/bccmd $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/ciptool $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/hciattach $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/hciconfig $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/hcidump $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/hcitool $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/l2ping $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/l2test $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/rctest $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/rfcomm $INSTALL/usr/bin
-    cp $PKG_BUILD/tools/sdptool $INSTALL/usr/bin
-
-# test
+mkdir -p $INSTALL/usr/lib/bluetooth
+  cp $PKG_BUILD/src/bluetoothd $INSTALL/usr/lib/bluetooth
+  cp $PKG_BUILD/obexd/src/obexd $INSTALL/usr/lib/bluetooth
 
 if [ "$DEVTOOLS" = "yes" ]; then
-# monitor
-  mkdir -p $INSTALL/usr/bin
-    cp $PKG_BUILD/monitor/btmon $INSTALL/usr/bin
+mkdir -p $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/bccmd $INSTALL/usr/bin
+  cp $PKG_BUILD/client/bluetoothctl $INSTALL/usr/bin
+  cp $PKG_BUILD/monitor/btmon $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/ciptool $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/hciattach $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/hciconfig $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/hcidump $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/hcitool $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/l2ping $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/l2test $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/rctest $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/rfcomm $INSTALL/usr/bin
+  cp $PKG_BUILD/tools/sdptool $INSTALL/usr/bin
 
-# test
   mkdir -p $INSTALL/usr/lib/bluez/test
     cp -P $PKG_BUILD/test/* $INSTALL/usr/lib/bluez/test
     chmod +x $INSTALL/usr/lib/bluez/test/*