diff --git a/srcpkgs/bluez/bluez-gstreamer.rshlibs b/srcpkgs/bluez/bluez-gstreamer.rshlibs
index 43296cbcf7..09f06f452f 100644
--- a/srcpkgs/bluez/bluez-gstreamer.rshlibs
+++ b/srcpkgs/bluez/bluez-gstreamer.rshlibs
@@ -1,12 +1,7 @@
 libdbus-1.so.3
-libpthread.so.0
 libgstreamer-0.10.so.0
 libgobject-2.0.so.0
-libgmodule-2.0.so.0
-libxml2.so.2
-libgthread-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
-libgstaudio-0.10.so.0
 libgstrtp-0.10.so.0
+libpthread.so.0
 libc.so.6
diff --git a/srcpkgs/bluez/bluez.rshlibs b/srcpkgs/bluez/bluez.rshlibs
index 01cd8ca5e3..25e3c21262 100644
--- a/srcpkgs/bluez/bluez.rshlibs
+++ b/srcpkgs/bluez/bluez.rshlibs
@@ -1,8 +1,8 @@
-libc.so.6
-libusb-0.1.so.4
 libglib-2.0.so.0
 libdbus-1.so.3
-libdl.so.2
-libreadline.so.6
+libc.so.6
+libusb-0.1.so.4
 libudev.so.1
+libreadline.so.6
+libdl.so.2
 librt.so.1
diff --git a/srcpkgs/bluez/libbluetooth-devel.template b/srcpkgs/bluez/libbluetooth-devel.template
index 374edb3b8f..9da8f22361 100644
--- a/srcpkgs/bluez/libbluetooth-devel.template
+++ b/srcpkgs/bluez/libbluetooth-devel.template
@@ -1,14 +1,13 @@
 # Template file for 'libbluetooth-devel'.
 #
-depends="glibc-devel libbluetooth"
+noarch=yes
+depends="libbluetooth-${version}_${revision}"
 short_desc="Development files to use the BlueZ Linux Bluetooth library"
 long_desc="
  BlueZ is the official Linux Bluetooth Stack. It is an Open Source project
  distributed under GNU General Public License (GPL)."
 
-
-do_install()
-{
+do_install() {
 	mkdir -p ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index a6f9499bac..b205a75049 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,22 +1,24 @@
 # Template file for 'bluez'
 pkgname=bluez
 version=4.101
-revision=2
-distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
+revision=3
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib --enable-gstreamer --enable-dund
---enable-alsa --enable-usb --enable-tools --enable-bccmd
---enable-hid2hci --enable-dfutool --enable-hidd --enable-pand
---enable-cups --enable-pnat --enable-wiimote --disable-test
---with-systemdunitdir=/usr/lib/systemd/system --enable-sap
---enable-datafiles --enable-dbusoob --enable-health"
-subpackages="bluez-alsa bluez-compat bluez-gstreamer libbluetooth libbluetooth-devel"
-makedepends="pkg-config flex libudev-devel>=183 readline-devel dbus-devel glib-devel
-gst-plugins-base-devel libusb-compat-devel libcap-ng-devel libsndfile-devel cups-devel"
+ --enable-alsa --enable-usb --enable-tools --enable-bccmd
+ --enable-hid2hci --enable-dfutool --enable-hidd --enable-pand
+ --enable-cups --enable-pnat --enable-wiimote --disable-test
+ --with-systemdunitdir=/usr/lib/systemd/system --enable-sap
+ --enable-datafiles --enable-dbusoob --enable-health"
+subpackages="bluez-alsa bluez-compat bluez-gstreamer
+ libbluetooth libbluetooth-devel"
+makedepends="pkg-config flex libudev-devel>=183 readline-devel
+ dbus-devel glib-devel libusb-compat-devel libcap-ng-devel
+ gst-plugins-base-devel libsndfile-devel cups-devel"
 short_desc="Bluetooth tools and daemons"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.bluez.org/"
 license="GPL-2"
+distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
 checksum=41f9578bef39b8c94a2d6ddeaa556afd22d136936d0f03100e422fe970a45a7d
 long_desc="
  This package contains tools and system daemons for using Bluetooth devices.