diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index b1cc62c548..83a4691375 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,12 +1,14 @@
 # Template file for 'qingy'
-pkgname="qingy"
-version="1.0.0"
-revision=11
+pkgname=qingy
+version=1.0.0
+revision=12
 lib32disabled=yes
 build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel"
-configure_args="--disable-static --disable-DirectFB-support"
-short_desc="Qingy Is Not GettY"
+makedepends="ncurses-devel libressl-devel
+ $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel scrnsaverproto')"
+configure_args="--disable-static --disable-DirectFB-support
+ $(vopt_enable pam) $(vopt_enable x11 x-support)"
+short_desc="Qingy Is Not Getty"
 maintainer="Jens E. Becker <v2px@v2px.de>"
 license="GPL-2"
 homepage="http://qingy.sourceforge.net"
@@ -20,25 +22,13 @@ conf_files="
  /etc/qingy/settings
  /etc/qingy/welcomes"
 
-build_options="pam x11"
+build_options="pam systemd x11"
 build_options_default="pam x11"
 
-if [ "$build_option_pam" ]; then
-    configure_args+=" --enable-pam"
-    makedepends+=" pam-devel"
-else
-    configure_args+=" --disable-pam"
-fi
-
-if [ "$build_option_x11" ]; then
-    configure_args+=" --enable-x-support"
-    makedepends+=" libXScrnSaver-devel libX11-devel scrnsaverproto"
-else
-    configure_args+=" --disable-x-support"
-fi
-
 post_install() {
-    vinstall ${FILESDIR}/qingy@.service 644 usr/lib/systemd/system
-    sed -i '/pam_console/d' ${DESTDIR}/etc/pam.d/qingy
-    sed -i 's#usr/X11R6/bin#usr/bin#' ${DESTDIR}/etc/qingy/settings
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/qingy@.service 644 usr/lib/systemd/system
+	fi
+	sed -i '/pam_console/d' ${DESTDIR}/etc/pam.d/qingy
+	sed -i 's#usr/X11R6/bin#usr/bin#' ${DESTDIR}/etc/qingy/settings
 }