diff --git a/bluez/.footprint b/bluez/.footprint
index 6f6a58624..dec7b65b0 100644
--- a/bluez/.footprint
+++ b/bluez/.footprint
@@ -15,21 +15,29 @@ drwxr-xr-x	root/root	lib/udev/rules.d/
 -rw-r--r--	root/root	lib/udev/rules.d/97-bluetooth-hid2hci.rules
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/bluez-avctrl
+-rwxr-xr-x	root/root	usr/bin/bluez-agent
+-rwxr-xr-x	root/root	usr/bin/bluez-attest
 -rwxr-xr-x	root/root	usr/bin/bluez-avinfo
--rwxr-xr-x	root/root	usr/bin/bluez-bccmd
+-rwxr-xr-x	root/root	usr/bin/bluez-avtest
+-rwxr-xr-x	root/root	usr/bin/bluez-btiotest
 -rwxr-xr-x	root/root	usr/bin/bluez-dfubabel
--rwxr-xr-x	root/root	usr/bin/bluez-hciattach
--rwxr-xr-x	root/root	usr/bin/bluez-hciconfig
+-rwxr-xr-x	root/root	usr/bin/bluez-gaptest
 -rwxr-xr-x	root/root	usr/bin/bluez-hcieventmask
 -rwxr-xr-x	root/root	usr/bin/bluez-hcisecfilter
--rwxr-xr-x	root/root	usr/bin/bluez-hid2hci
 -rwxr-xr-x	root/root	usr/bin/bluez-hsmicro
 -rwxr-xr-x	root/root	usr/bin/bluez-hsplay
+-rwxr-xr-x	root/root	usr/bin/bluez-hsplaye
+-rwxr-xr-x	root/root	usr/bin/bluez-hstest
+-rwxr-xr-x	root/root	usr/bin/bluez-ipctest
 -rwxr-xr-x	root/root	usr/bin/bluez-list-devices
+-rwxr-xr-x	root/root	usr/bin/bluez-lmptest
 -rwxr-xr-x	root/root	usr/bin/bluez-monitor-bluetooth
+-rwxr-xr-x	root/root	usr/bin/bluez-mpris-player
 -rwxr-xr-x	root/root	usr/bin/bluez-ppporc
+-rwxr-xr-x	root/root	usr/bin/bluez-scotest
+-rwxr-xr-x	root/root	usr/bin/bluez-sdptest
 -rwxr-xr-x	root/root	usr/bin/bluez-simple-agent
+-rwxr-xr-x	root/root	usr/bin/bluez-simple-agente
 -rwxr-xr-x	root/root	usr/bin/bluez-simple-endpoint
 -rwxr-xr-x	root/root	usr/bin/bluez-simple-player
 -rwxr-xr-x	root/root	usr/bin/bluez-simple-service
@@ -37,11 +45,14 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/bluez-test-attrib
 -rwxr-xr-x	root/root	usr/bin/bluez-test-audio
 -rwxr-xr-x	root/root	usr/bin/bluez-test-device
+-rwxr-xr-x	root/root	usr/bin/bluez-test-devicee
 -rwxr-xr-x	root/root	usr/bin/bluez-test-discovery
+-rwxr-xr-x	root/root	usr/bin/bluez-test-discoverye
 -rwxr-xr-x	root/root	usr/bin/bluez-test-health
 -rwxr-xr-x	root/root	usr/bin/bluez-test-health-sink
 -rwxr-xr-x	root/root	usr/bin/bluez-test-input
 -rwxr-xr-x	root/root	usr/bin/bluez-test-manager
+-rwxr-xr-x	root/root	usr/bin/bluez-test-managere
 -rwxr-xr-x	root/root	usr/bin/bluez-test-nap
 -rwxr-xr-x	root/root	usr/bin/bluez-test-network
 -rwxr-xr-x	root/root	usr/bin/bluez-test-oob
@@ -51,7 +62,9 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/bluez-test-serial-proxy
 -rwxr-xr-x	root/root	usr/bin/bluez-test-service
 -rwxr-xr-x	root/root	usr/bin/bluez-test-telephony
+-rwxr-xr-x	root/root	usr/bin/bluez-test-textfile
 -rwxr-xr-x	root/root	usr/bin/bluez-test-thermometer
+-rwxr-xr-x	root/root	usr/bin/bluez-uuidtest
 -rwxr-xr-x	root/root	usr/bin/ciptool
 -rwxr-xr-x	root/root	usr/bin/dfutool
 -rwxr-xr-x	root/root	usr/bin/dund
@@ -59,7 +72,9 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/hcitool
 -rwxr-xr-x	root/root	usr/bin/hidd
 -rwxr-xr-x	root/root	usr/bin/l2ping
+-rwxr-xr-x	root/root	usr/bin/l2test
 -rwxr-xr-x	root/root	usr/bin/pand
+-rwxr-xr-x	root/root	usr/bin/rctest
 -rwxr-xr-x	root/root	usr/bin/rfcomm
 -rwxr-xr-x	root/root	usr/bin/sdptool
 drwxr-xr-x	root/root	usr/etc/
@@ -108,18 +123,18 @@ drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/ciptool.1.gz
 -rw-r--r--	root/root	usr/man/man1/dfutool.1.gz
 -rw-r--r--	root/root	usr/man/man1/dund.1.gz
+-rw-r--r--	root/root	usr/man/man1/hciemu.1.gz
 -rw-r--r--	root/root	usr/man/man1/hcitool.1.gz
 -rw-r--r--	root/root	usr/man/man1/hidd.1.gz
 -rw-r--r--	root/root	usr/man/man1/pand.1.gz
+-rw-r--r--	root/root	usr/man/man1/rctest.1.gz
 -rw-r--r--	root/root	usr/man/man1/rfcomm.1.gz
 -rw-r--r--	root/root	usr/man/man1/sdptool.1.gz
 drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/bccmd.8.gz
 -rw-r--r--	root/root	usr/man/man8/bluetoothd.8.gz
 -rw-r--r--	root/root	usr/man/man8/bluez-avctrl.8.gz
--rw-r--r--	root/root	usr/man/man8/bluez-bccmd.8.gz
--rw-r--r--	root/root	usr/man/man8/bluez-hciattach.8.gz
--rw-r--r--	root/root	usr/man/man8/bluez-hciconfig.8.gz
+-rw-r--r--	root/root	usr/man/man8/bluez-bdaddr.8.gz
 -rw-r--r--	root/root	usr/man/man8/bluez-hid2hci.8.gz
 -rw-r--r--	root/root	usr/man/man8/hciattach.8.gz
 -rw-r--r--	root/root	usr/man/man8/hciconfig.8.gz
@@ -128,8 +143,12 @@ drwxr-xr-x	root/root	usr/man/man8/
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/bccmd
 -rwxr-xr-x	root/root	usr/sbin/bluetoothd
+-rwxr-xr-x	root/root	usr/sbin/bluez-avctrl
+-rwxr-xr-x	root/root	usr/sbin/bluez-bdaddr
+-rwxr-xr-x	root/root	usr/sbin/bluez-hid2hci
 -rwxr-xr-x	root/root	usr/sbin/hciattach
 -rwxr-xr-x	root/root	usr/sbin/hciconfig
+-rwxr-xr-x	root/root	usr/sbin/hciemu
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/alsa/
 -rw-r--r--	root/root	usr/share/alsa/bluetooth.conf
diff --git a/bluez/Pkgfile b/bluez/Pkgfile
index cf336e77b..ac2215012 100644
--- a/bluez/Pkgfile
+++ b/bluez/Pkgfile
@@ -2,11 +2,11 @@
 # URL:		http://www.bluez.org/
 # Maintainer:	Alan Mizrahi, alan at mizrahi dot com dot ve
 # Depends on:	dbus alsa-lib gstreamer libusb-compat
-# Optional:	pygobject dbus-python
+# Optional:	pygobject dbus-python sox
 
 name=bluez
 version=4.101
-release=2
+release=3
 source=(http://www.kernel.org/pub/linux/bluetooth/bluez-$version.tar.xz bluetoothd)
 
 build() {
@@ -22,7 +22,7 @@ build() {
 		--enable-gstreamer \
 		--enable-usb \
 		--enable-tools \
-		--disable-test \
+		--enable-test \
 		--enable-hidd \
 		--enable-hid2hci \
 		--enable-pand \
@@ -38,8 +38,13 @@ build() {
 	# install all available tools and test programs with man pages
 	shopt -s nullglob
 	for i in test/* tools/*; do
-		if [ -x $i -a ! -d $i -a ! -x $PKG/usr/bin/${i##*/} ]; then
-			install -D -m 755 $i $PKG/usr/bin/bluez-${i#*/}
+		if [ -x $i -a ! -d $i -a ! -x $PKG/usr/bin/${i##*/} -a ! -x $PKG/usr/sbin/${i##*/} ]; then
+			if [ -f $i.8 ]; then
+				install -D -m 755 $i $PKG/usr/sbin/bluez-${i#*/}
+			else
+				install -D -m 755 $i $PKG/usr/bin/bluez-${i#*/}
+			fi
+
 			for j in $i.[1-8]; do
 				install -D -m 644 $j $PKG/usr/man/man${j##*.}/bluez-${j##*/}
 			done
@@ -57,4 +62,9 @@ build() {
 	# this is because of the /usr/etc CRUX oddity
 	mkdir $PKG/usr/etc
 	mv $PKG/etc/dbus-1 $PKG/usr/etc
+
+	# fix some python scripts
+	sed -ie 's|from gi.repository import GObject|import gobject as GObject|g' \
+		$PKG/usr/bin/bluez-{simple-agent,test-device,test-discovery,test-manager}
+	sed -ie 's|hstest|bluez-hstest|g' $PKG/usr/bin/bluez-hsplay
 }
diff --git a/bluez/README b/bluez/README
index 79df4ef31..b6cef2f2d 100644
--- a/bluez/README
+++ b/bluez/README
@@ -1,7 +1,8 @@
 Bluez uses dbus for inter-process communication.
-If your desktop applications are unable to connect to the bluetooth daemon
-please check the bluetooth security policies in
+
+If your bluetooth applications are unable to communicate with the bluetooth daemon
+please check the dbus security policies in:
 /usr/etc/dbus-1/system.d/bluetooth.conf
 
-pygobject 3.2.2 and dbus-python are required for the tools for pairing and such,
-but they can be omitted at will.
+The python scripts were last tested with python-2.7.8 and pygobject-2.28.6.
+