diff --git a/PKGBUILD b/PKGBUILD
index bb4add3..f440154 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,9 +18,10 @@ makedepends=('doxygen')
 source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
         'tmpfiles.d'
         'conf')
-sha1sums=('5a4b5f5b0447994f3fc186ffd7c16cabeeed2978' 'SKIP'
-          'f4d5922abb69abb739542d8e93f4dfd748acdad7'
-          '67c145c046cddd885630d72ce8ebe71f8321ff3b')
+sha256sums=('8a33225f8abeb312f794ded01aaaa14e61ddcaf3723d298e266892343dae285d'
+            'SKIP'
+            'c1683ba35774c85e16c70e89f7e2ed1c09619512b1a273daabbd5e34d40439bd'
+            'f40f68205834ca53cea3372e930bfe6c2f9ecc9df3b1605df2fec63a658b2e03')
 
 backup=('etc/mpd.conf')
 install=install
@@ -49,4 +50,5 @@ package() {
 
 	install -Dm644 "${pkgdir}"/usr/lib/systemd/{system,user}/mpd.service
 	sed '/WantedBy=/c WantedBy=default.target' -i "${pkgdir}"/usr/lib/systemd/user/mpd.service
+	sed '/^\[Service\]$/a User=mpd' -i "${pkgdir}"/usr/lib/systemd/system/mpd.service
 }
diff --git a/conf b/conf
index d23880e..da7d6fa 100644
--- a/conf
+++ b/conf
@@ -1,6 +1,5 @@
 # See: /usr/share/doc/mpd/mpdconf.example
 
-user "mpd"
 pid_file "/run/mpd/mpd.pid"
 db_file "/var/lib/mpd/mpd.db"
 state_file "/var/lib/mpd/mpdstate"