diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index b2717ebe5f..9f7cf6f9ac 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -1,7 +1,7 @@
 # Template file for 'systemd'
 pkgname=systemd
 version=202
-revision=1
+revision=2
 short_desc="A system and service manager for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/systemd"
@@ -36,6 +36,46 @@ if [ "$CROSS_BUILD" ]; then
 	}
 fi
 
+# Package build options
+build_options="efi microhttpd qrencode tcpwrappers"
+desc_option_efi="Enable support for EFI"
+desc_option_microhttpd="Enable support for microhttpd"
+desc_option_qrencode="Enable support for qrencode"
+desc_option_tcpwrappers="Enable support for tcpwrappers"
+
+# Enable EFI by default on x86.
+if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	build_options_default="efi"
+fi
+
+if [ "$build_option_efi" ]; then
+	configure_args+=" --enable-efi"
+else
+	configure_args+=" --disable-efi"
+fi
+
+if [ "$build_option_microhttpd" ]; then
+	configure_args+=" --enable-microhttpd"
+	makedepends+=" libmicrohttpd-devel"
+else
+	configure_args+=" --disable-microhttpd"
+fi
+
+if [ "$build_option_qrencode" ]; then
+	configure_args+=" --enable-qrencode"
+	makedepends+=" qrencode-devel"
+else
+	configure_args+=" --disable-qrencode"
+fi
+
+if [ "$build_option_tcpwrappers" ]; then
+	configure_args+=" --enable-tcpwrappers"
+	makedepends+=" tcp_wrappers-devel"
+else
+	configure_args+=" --disable-tcpwrappers"
+fi
+
+
 post_install() {
 	# Remove useless doc directory.
 	rm -rf ${DESTDIR}/usr/share/doc
@@ -101,7 +141,7 @@ libgudev-devel_package() {
 }
 
 systemd-python_package() {
-	short_desc="${sourcepkg} - python bindings"
+	short_desc+=" - python bindings"
 	pycompile_module="systemd"
 	pkg_install() {
 		vmove "usr/lib/python*"