diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index 0062290e5c..6254585b6d 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,22 +1,22 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.9.17
-revision=2
+version=0.9.18
+revision=1
 build_style=gnu-configure
-configure_args="--with-backend=linux
+configure_args="--disable-static --with-backend=linux
 --with-systemdsystemunitdir=/usr/lib/systemd/system"
 conf_files="/etc/UPower/UPower.conf"
 subpackages="upower-devel"
 depends="dbus"
 makedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection
-libusb-devel libgudev-devel dbus-glib-devel polkit-devel"
+libusb-devel libgudev-devel dbus-glib-devel polkit-devel systemd-devel"
 fulldepends="udev pm-utils"
 short_desc="Abstraction for enumerating power devices"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://upower.freedesktop.org"
 distfiles="${homepage}/releases/$pkgname-$version.tar.xz"
-checksum=cf9f68d28fec9cacfb44054c2996a877a9ef4a449cfe279394d46442de153228
+checksum=a1a1505d2f95e9398a9bed90917c78a6ee0c3d7956aef1ce011717d20467068f
 long_desc="
  UPower is an abstraction for enumerating power devices, listening to device
  events and querying history and statistics. Any application or service on
diff --git a/srcpkgs/upower/upower-devel.template b/srcpkgs/upower/upower-devel.template
index 28d209f856..bcd5200044 100644
--- a/srcpkgs/upower/upower-devel.template
+++ b/srcpkgs/upower/upower-devel.template
@@ -1,17 +1,15 @@
 # Template file for 'upower-devel'.
 #
-depends="libusb-compat-devel libgudev-devel dbus-glib-devel polkit-devel upower>=$version"
+noarch=yes
+depends="dbus-devel glib-devel upower>=$version"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains the files needed for developing applications
  that use UPower."
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/{lib,share}
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/gir-1.0 ${DESTDIR}/usr/share
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/gir-1.0 usr/share
 }
diff --git a/srcpkgs/upower/upower.rshlibs b/srcpkgs/upower/upower.rshlibs
index 0434360530..7ba2b8c9bf 100644
--- a/srcpkgs/upower/upower.rshlibs
+++ b/srcpkgs/upower/upower.rshlibs
@@ -8,3 +8,4 @@ libdbus-glib-1.so.2
 libdbus-1.so.3
 libusb-1.0.so.0
 libgudev-1.0.so.0
+libsystemd-daemon.so.0