diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index c1fa5118c12..64217485576 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,12 +1,12 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.37
-revision=4
+version=0.6.38
+revision=1
 build_style=gnu-configure
-configure_args="--disable-static
+configure_args="--disable-static $(vopt_enable systemd) $(vopt_enable gir introspection)
  ac_cv_file__etc_redhat_release=no ac_cv_file__etc_debian_version=no"
-hostmakedepends="pkg-config intltool glib-devel"
-makedepends="polkit-devel"
+hostmakedepends="pkg-config intltool glib-devel $(vopt_if gir gobject-introspection)"
+makedepends="polkit-devel $(vopt_if systemd systemd-devel)"
 make_dirs="
 	/var/lib/AccountsService/users 755 root root
 	/var/lib/AccountsService/icons 755 root root"
@@ -15,7 +15,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://cgit.freedesktop.org/accountsservice/"
 license="GPL-3"
 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz"
-checksum=b0b21136dc9d74a7135fd5ed7fa1a8069efb91bc6ecc1ef8911125433345a5c1
+checksum=36332194478b076136648a1263206dea4800296880ebbff3f7a9e7533616a3a9
 
 # Package build options
 build_options="gir systemd"
@@ -24,20 +24,6 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gir"
 fi
 
-if [ "$build_option_gir" ]; then
-	configure_args+=" --enable-introspection"
-	makedepends+=" 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
-
 accountsservice-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"