diff --git a/srcpkgs/udisks2/template b/srcpkgs/udisks2/template
index 732a4f8ca4..fbbd67d672 100644
--- a/srcpkgs/udisks2/template
+++ b/srcpkgs/udisks2/template
@@ -1,13 +1,15 @@
 # Template file for 'udisks2'
 pkgname=udisks2
-version=2.1.3
-revision=4
+version=2.1.4
+revision=1
 wrksrc="udisks-${version}"
 build_style=gnu-configure
-configure_args="--disable-static --with-udevdir=/usr/lib/udev"
+configure_args="--disable-static --with-udevdir=/usr/lib/udev
+ $(vopt_enable gir introspection) $(vopt_enable systemd)"
 hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
 makedepends="acl-devel device-mapper-devel liblvm2app-devel libparted-devel
- libatasmart-devel polkit-devel libgudev-devel sg3_utils-devel"
+ libatasmart-devel polkit-devel libgudev-devel sg3_utils-devel
+ $(vopt_if gir gobject-introspection) $(vopt_if systemd systemd-devel)"
 make_dirs="/var/lib/udisks2 0750 root root"
 short_desc="Disk Management Service, version 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -15,7 +17,7 @@ homepage="http://www.freedesktop.org/wiki/Software/udisks"
 license="GPL-2"
 update_pkgname=udisks
 distfiles="http://udisks.freedesktop.org/releases/udisks-${version}.tar.bz2"
-checksum=5cc92fd651ee49a7888f90d091282b949afc629b31fdb34e187208750720632d
+checksum=a4e148dd3a4a209160452a12cfe770382836027002f6c84f2e6c17eb5be519bb
 
 # Package build options
 build_options="gir systemd"
@@ -24,24 +26,6 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gir"
 fi
 
-if [ "$build_option_gir" ]; then
-	configure_args+=" --enable-introspection"
-	hostmakedepends+=" gobject-introspection"
-else
-	configure_args+=" --disable-introspection"
-fi
-
-if [ "$build_option_systemd" ]; then
-	configure_args+=" --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system"
-	makedepends+=" systemd-devel"
-else
-	configure_args+=" --disable-systemd"
-fi
-
-pre_configure() {
-	sed 's,-Werror,,g' -i configure
-}
-
 udisks2-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"