diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index 14b638d05f..e1fb27b98c 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -1,7 +1,7 @@
 # Template file for 'systemd'
 pkgname=systemd
 version=198
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib
  --disable-selinux --disable-tcpwrap --with-rootprefix=/usr
@@ -10,7 +10,7 @@ configure_args="--libexecdir=/usr/lib
 depends="dbus kbd libcap-progs libudev>=${version} systemd-libs>=${version}"
 hostmakedepends="which pkg-config intltool gperf libxslt docbook-xsl"
 makedepends="acl-devel pam-devel dbus-devel libcap-devel libkmod-devel liblzma-devel
- crypsetup-devel libblkid-devel glib-devel libgcrypt-devel python-devel qrencode-devel
+ cryptsetup-devel libblkid-devel glib-devel libgcrypt-devel python-devel
  gobject-introspection"
 short_desc="A system and service manager for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -37,12 +37,11 @@ conf_files="
 if [ "$XBPS_CROSS_BUILD" ]; then
 	# XXX add support to gudev, introspection and python.
 	unset subpackages
-	hostmakedepends="automake gettext-devel pkg-config intltool
+	hostmakedepends="libtool automake gettext-devel pkg-config intltool
 		     gperf libxslt docbook-xsl libgcrypt-devel"
 	makedepends="acl-devel pam-devel dbus-devel libcap-devel
 			libkmod-devel liblzma-devel cryptsetup-devel
-			libblkid-devel libgcrypt-devel libglib-devel
-			qrencode-devel"
+			libblkid-devel libgcrypt-devel libglib-devel"
 	configure_args="${configure_args} --without-python --disable-gudev
 			--enable-introspection=no
 			ac_cv_func_malloc_0_nonnull=yes
diff --git a/srcpkgs/systemd/template.options b/srcpkgs/systemd/template.options
new file mode 100644
index 0000000000..015bd29895
--- /dev/null
+++ b/srcpkgs/systemd/template.options
@@ -0,0 +1,40 @@
+# Package build options
+build_options="qrencode microhttpd tcpwrappers efi"
+desc_option_qrencode="Enable support for qrencode"
+desc_option_microhttpd="Enable support for microhttpd"
+desc_option_tcpwrappers="Enable support for tcpwrappers"
+desc_option_efi="Enable support for EFI"
+
+# Enable EFI by default on x86.
+if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	build_options_default="efi"
+fi
+
+do_options() {
+	if [ "$build_option_qrencode" ]; then
+		configure_args="${configure_args} --enable-qrencode"
+		makedepends="${makedepends} qrencode-devel"
+	else
+		configure_args="${configure_args} --disable-qrencode"
+	fi
+
+	if [ "$build_option_microhttpd" ]; then
+		configure_args="${configure_args} --enable-microhttpd"
+		makedepends="${makedepends} microhttpd-devel"
+	else
+		configure_args="${configure_args} --disable-microhttpd"
+	fi
+
+	if [ "$build_option_tcpwrappers" ]; then
+		configure_args="${configure_args} --enable-tcpwrappers"
+		makedepends="${makedepends} tcp_wrappers-devel"
+	else
+		configure_args="${configure_args} --disable-tcpwrappers"
+	fi
+
+	if [ "$build_option_efi" ]; then
+		configure_args="${configure_args} --enable-efi"
+	else
+		configure_args="${configure_args} --disable-efi"
+	fi
+}