diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index 2868a70e8b6f..ce73745ade32 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -1,6 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib }:
+{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, python, makeWrapper
+, pythonDBus, pygobject }:
 
 assert stdenv.isLinux;
+
+let
+  pythonpath = "${pythonDBus}/lib/${python.libPrefix}/site-packages:"
+    + "${pygobject}/lib/${python.libPrefix}/site-packages";
+in
    
 stdenv.mkDerivation rec {
   name = "bluez-4.69";
@@ -10,13 +16,22 @@ stdenv.mkDerivation rec {
     sha256 = "1h4fp6l1sflc0l5vg90hzvgldlwv7rqc4cbn2z6axmxv969pmrhh";
   };
 
-  buildInputs = [ pkgconfig dbus.libs glib libusb alsaLib ];
+  buildInputs = [ pkgconfig dbus.libs glib libusb alsaLib python makeWrapper ];
 
   configureFlags = "--localstatedir=/var";
 
   # Work around `make install' trying to create /var/lib/bluetooth.
   installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";
 
+  postInstall = ''
+    pushd test
+    for a in simple-agent test-adapter test-device; do
+      cp $a $out/bin/bluez-$a
+      wrapProgram $out/bin/bluez-$a --prefix PYTHONPATH : ${pythonpath}
+    done
+    popd
+  '';
+
   meta = {
     homepage = http://www.bluez.org/;
     description = "Bluetooth support for Linux";