diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index c09394366f3..1f1cab0b89d 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
 # Template file for 'mpd'
 pkgname=mpd
 version=0.18.11
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-soundcloud --enable-pipe-output --disable-twolame-encoder
@@ -13,7 +13,7 @@ makedepends="
  sqlite-devel libmms-devel avahi-glib-libs-devel libid3tag-devel
  yajl-devel>=2.0.4 libogg-devel libflac-devel libsoup-devel bzip2-devel
  libmikmod-devel libsndfile-devel alsa-lib-devel mpg123-devel libsamplerate-devel
- libcdio-devel systemd-devel zziplib-devel libmpdclient-devel"
+ libcdio-devel zziplib-devel libmpdclient-devel"
 conf_files="/etc/mpd.conf"
 system_accounts="mpd"
 systemd_services="mpd.service on"
@@ -41,14 +41,15 @@ post_install() {
 }
 
 # Package build options
-build_options="jack lame mpcdec pulseaudio wavpack"
+build_options="jack lame mpcdec pulseaudio systemd wavpack"
 desc_option_jack="Enable support for the JACK sound server"
 desc_option_lame="Enable support for the LAME encoder"
 desc_option_mpcdec="Enable support for the Musepack decoder"
+desc_option_systemd="Enable support for systemd"
 desc_option_pulseaudio="Enable support for the PulseAudio sound server"
 desc_option_wavpack="Enable support for the Wavpack decoder"
 
-build_options_default="pulseaudio"
+build_options_default="systemd pulseaudio"
 
 if [ "$build_option_jack" ]; then
 	configure_args+=" --enable-jack"
@@ -78,6 +79,13 @@ else
 	configure_args+=" --disable-pulse"
 fi
 
+if [ "$build_option_systemd" ]; then
+	configure_args+=" --enable-systemd-daemon"
+	makedepends+=" systemd-devel"
+else
+	configure_args+=" --disable-systemd-daemon"
+fi
+
 if [ "$build_option_wavpack" ]; then
 	configure_args+=" --enable-wavpack"
 	makedepends+=" wavpack-devel"