diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
new file mode 100644
index 00000000000..4ffa873e9b5
--- /dev/null
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, xz, pkgconfig, glib, dbus, dbus_glib, polkit
+, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils }:
+
+assert stdenv.isLinux;
+
+stdenv.mkDerivation rec {
+  name = "upower-0.9.12";
+
+  src = fetchurl {
+    url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
+    sha256 = "1c2b2f74vxx1y7vkwbrx5z4j5pdgvsw00l6cldvy7a4k7hrbprq6";
+  };
+
+  buildInputs =
+    [ xz pkgconfig glib dbus dbus_glib polkit intltool
+      libxslt docbook_xsl udev libusb1
+    ];
+
+  configureFlags = "--with-backend=linux --localstatedir=/var";
+
+  preConfigure =
+    ''
+      substituteInPlace src/linux/up-backend.c \
+        --replace /usr/bin/pm- ${pmutils}/bin/pm- \
+        --replace /usr/sbin/pm- ${pmutils}/sbin/pm-
+    '';
+
+  installFlags = "localstatedir=$(TMPDIR)/var";
+
+  meta = {
+    homepage = http://upower.freedesktop.org/;
+    description = "A D-Bus service for power management";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d1c1cb2cc5..53beee22167 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5703,6 +5703,8 @@ let
 
   untie = callPackage ../os-specific/linux/untie {};
 
+  upower = callPackage ../os-specific/linux/upower { };
+  
   upstart = callPackage ../os-specific/linux/upstart { };
 
   usbutils = callPackage ../os-specific/linux/usbutils { };