diff --git a/srcpkgs/bluez/files/bluetooth.service b/srcpkgs/bluez/files/bluetooth.service
deleted file mode 100644
index b9898a8c3bb..00000000000
--- a/srcpkgs/bluez/files/bluetooth.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Bluetooth Manager
-After=syslog.target
-
-[Service]
-Type=dbus
-BusName=org.bluez
-ExecStart=/usr/sbin/bluetoothd -n
-StandardOutput=syslog
-
-[Install]
-WantedBy=bluetooth.target
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index 4d4fcadfd75..06e05b1a536 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,18 +1,18 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=4.94
-revision=1
+version=4.96
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--libexecdir=/lib --enable-gstreamer
 --enable-alsa --enable-usb --enable-tools --enable-bccmd
 --enable-hid2hci --enable-dfutool --enable-hidd --enable-pand --enable-dund
---disable-cups --enable-configfiles --enable-capng --enable-pnat"
+--disable-cups --enable-capng --enable-pnat
+--with-systemdunitdir=/lib/systemd/system"
 short_desc="Bluetooth tools and daemons"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.bluez.org/"
 license="GPL-2"
-checksum=26286e653361a0342349d29e302969a01d1c9d534a6ee365ccbf0a0b79b5729e
+checksum=7b34aa28c831d77e92d348951653bc58347f4b6177e2f89cd5ffb8ffc37142ae
 long_desc="
  This package contains tools and system daemons for using Bluetooth devices.
 
@@ -20,12 +20,12 @@ long_desc="
  project distributed under GNU General Public License (GPL)."
 
 conf_files="
-/etc/bluetooth/audio.conf
-/etc/bluetooth/input.conf
 /etc/bluetooth/main.conf
+/etc/bluetooth/rfcomm.conf
 /etc/bluetooth/network.conf
-/etc/bluetooth/serial.conf
-/etc/bluetooth/rfcomm.conf"
+/etc/bluetooth/input.conf
+/etc/bluetooth/audio.conf
+/etc/bluetooth/serial.conf"
 
 subpackages="$pkgname-alsa $pkgname-compat $pkgname-gstreamer libbluetooth"
 subpackages="$subpackages libbluetooth-devel"
@@ -49,6 +49,7 @@ Add_dependency build dbus-devel
 Add_dependency build glib-devel
 Add_dependency build libusb-compat-devel
 Add_dependency build libcap-ng-devel
+Add_dependency build libsndfile-devel
 
 post_install()
 {
@@ -60,6 +61,5 @@ post_install()
 		${DESTDIR}/usr/bin/bluez-simple-agent
 
 	# systemd takes care of bluetoothd initialization.
-	vinstall ${FILESDIR}/bluetooth.service 644 lib/systemd/system
 	rm -f ${DESTDIR}/lib/udev/rules.d/97-bluetooth.rules
 }