diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index 84f14e3d8f..86a01b8c8b 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -3,12 +3,12 @@ pkgname=bluez
 version=4.96
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-configure_args="--libexecdir=/lib --enable-gstreamer
+configure_args="--libexecdir=/lib --enable-gstreamer --enable-dund
 --enable-alsa --enable-usb --enable-tools --enable-bccmd
---enable-hid2hci --enable-dfutool --enable-hidd --enable-pand --enable-dund
---disable-cups --enable-capng --enable-pnat
+--enable-hid2hci --enable-dfutool --enable-hidd --enable-pand
+--disable-cups --enable-capng --enable-pnat --enable-wiimote
 --with-systemdunitdir=/lib/systemd/system"
-revision=1
+revision=2
 short_desc="Bluetooth tools and daemons"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.bluez.org/"
@@ -20,6 +20,7 @@ long_desc="
  BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
  project distributed under GNU General Public License (GPL)."
 
+make_dirs="/var/lib/bluetooth 0750 root root"
 conf_files="
 /etc/bluetooth/main.conf
 /etc/bluetooth/rfcomm.conf
@@ -31,7 +32,6 @@ conf_files="
 subpackages="$pkgname-alsa $pkgname-compat $pkgname-gstreamer libbluetooth"
 subpackages="$subpackages libbluetooth-devel"
 
-
 Add_dependency build pkg-config
 Add_dependency build flex
 Add_dependency build libudev-devel
@@ -46,13 +46,13 @@ Add_dependency build libsndfile-devel
 
 post_install()
 {
-	install -d ${DESTDIR}/lib/udev/rules.d
-	install -m644 network/network.conf input/input.conf audio/audio.conf \
-		serial/serial.conf ${DESTDIR}/etc/bluetooth
-	install -m755 scripts/bluetooth_serial ${DESTDIR}/lib/udev
-	install -m755 test/simple-agent \
-		${DESTDIR}/usr/bin/bluez-simple-agent
-
+	for f in network input audio serial; do
+		vinstall ${f}/${f}.conf 644 etc/bluetooth
+	done
+	vinstall scripts/bluetooth_serial 755 lib/udev
+	for f in simple-agent test-device test-input; do
+		vinstall test/${f} 755 usr/bin bluez-${f}
+	done
 	# systemd takes care of bluetoothd initialization.
 	rm -f ${DESTDIR}/lib/udev/rules.d/97-bluetooth.rules
 }