diff --git a/srcpkgs/udisks/template b/srcpkgs/udisks/template
index daac0f9be61..645b9325c1c 100644
--- a/srcpkgs/udisks/template
+++ b/srcpkgs/udisks/template
@@ -1,10 +1,11 @@
 # Template file for 'udisks'
 pkgname=udisks
 version=1.0.4
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--disable-static --enable-lvm2"
-makedepends="pkg-config intltool libxslt docbook-xsl device-mapper-devel
+hostmakedepends="pkg-config intltool libxslt docbook-xsl"
+makedepends="glib-devel device-mapper-devel
  liblvm2app-devel libparted-devel libatasmart-devel polkit-devel
  dbus-glib-devel libgudev-devel>=183 sg3_utils-devel"
 short_desc="Disk Management Service"
@@ -29,19 +30,16 @@ pre_configure() {
 		-e "s|\(slashsbindir\)=.*|\1=/usr/sbin|g" configure
 }
 
-pre_build() {
-	# Fix location for bash completion stuff.
-	sed -i -e 's|profile.d|bash_completion.d|' tools/Makefile
-}
-
 post_install() {
 	vinstall ${FILESDIR}/udisks.service 644 usr/lib/systemd/system
+	vmkdir usr/share/bash-completion/completions
+	mv ${DESTDIR}/etc/profile.d/udisks-bash-completion.sh \
+		${DESTDIR}/usr/share/bash-completion/completions/udisks
 }
 
 udisks_package() {
 	make_dirs="/var/lib/udisks 0750 root root"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }