diff --git a/srcpkgs/mpd/files/tmpfiles.d b/srcpkgs/mpd/files/tmpfiles.d
new file mode 100644
index 0000000000..41c4e743a3
--- /dev/null
+++ b/srcpkgs/mpd/files/tmpfiles.d
@@ -0,0 +1 @@
+d /run/mpd 0755 mpd mpd
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
new file mode 100644
index 0000000000..545148ff12
--- /dev/null
+++ b/srcpkgs/mpd/template
@@ -0,0 +1,45 @@
+# Template file for 'mpd'
+pkgname=mpd
+version=0.17.4
+revision=1
+build_style=gnu-configure
+configure_args="--enable-jack --enable-lastfm --enable-soundcloud --enable-pipe-output
+ --enable-pulse --disable-sidplay --with-systemdsystemunitdir=/usr/lib/systemd/system
+ --enable-bzip2 --enable-zzip"
+hostmakedepends="pkg-config"
+makedepends="ffmpeg-devel libmodplug-devel libmad-devel libcurl-devel faad2-devel
+ sqlite-devel jack-devel libmms-devel wavpack-devel avahi-glib-libs-devel libid3tag-devel
+ yajl-devel>=2.0.4 pulseaudio-devel libogg-devel libflac-devel libsoup-devel bzip2-devel
+ libmikmod-devel libsndfile-devel alsa-lib-devel mpg123-devel libsamplerate-devel
+ libcdio-devel libmpcdec-devel systemd-devel zziplib-devel"
+short_desc="Flexible, powerful, server-side application for playing music"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-3"
+homepage="http://www.musicpd.org/"
+distfiles="http://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
+checksum=e94780395cabdcb861162297deef52d7a0baa3b3ad57f4b2089d208f3b62c7ce
+
+post_install() {
+	vinstall doc/mpdconf.example 644 etc mpd.conf
+	vinstall ${FILESDIR}/tmpfiles.d 644 usr/lib/tmpfiles.d mpd.conf
+	vmkdir usr/lib/systemd/user
+	ln -s ../system/mpd.service ${DESTDIR}/usr/lib/systemd/user/mpd.service
+	sed \
+		-e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \
+		-e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \
+		-e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \
+		-e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \
+		-e '/^#user/c user "mpd"' \
+		-i ${DESTDIR}/etc/mpd.conf
+}
+
+mpd_package() {
+	conf_files="/etc/mpd.conf"
+	system_accounts="mpd"
+	systemd_services="mpd.service on"
+	mpd_homedir="/var/lib/mpd"
+	make_dirs="/var/lib/mpd/playlists 0755 mpd mpd"
+	pkg_install() {
+		vmove all
+	}
+}