diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index d2cbcc8f6ff..44f45327e2c 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,7 +1,7 @@
 # Template file for 'upower'
 pkgname=upower
 version=0.9.20
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --with-backend=linux --without-idevice
 --enable-systemd --with-systemdutildir=/usr/lib/systemd
@@ -21,7 +21,7 @@ pre_configure() {
 
 upower-devel_package() {
 	depends="dbus-devel libglib-devel upower>=$version"
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
@@ -31,8 +31,8 @@ upower-devel_package() {
 
 upower_package() {
 	conf_files="/etc/UPower/UPower.conf"
+	make_dirs="/var/lib/upowerd 0755 root root"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }