diff --git a/aur/umurmur/PKGBUILD b/aur/umurmur/PKGBUILD
index 5c07b53a9..a38e5b148 100644
--- a/aur/umurmur/PKGBUILD
+++ b/aur/umurmur/PKGBUILD
@@ -1,36 +1,33 @@
+# Maintainer: Robert Knauer <robert@privatdemail.net>
 # Contributor : xav <xav at ethertricks dot net>
 
-# ALARM: Mike Brown <mbrown@archlinuxarm.org>
-#  - systemd service file addition
-
 pkgname=umurmur
-pkgver=0.2.10
-pkgrel=3
+pkgver=0.2.12
+pkgrel=1
 pkgdesc="A minimalistic Mumble server"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/umurmur/"
 license=('GPL')
-depends=('libconfig' 'protobuf-c')
-source=(http://umurmur.googlecode.com/files/${pkgname}-${pkgver}.tar.gz \
-        umurmur.rc.d \
-        umurmur.conf.d \
-        umurmur.1 \
-        umurmur.service)
-sha1sums=('5a53b021078dfbdf001c9af9ff207ea84bcf8222'
-          'c4f91846a6ee16437452c024652d2f5eca0c0c2a'
-          '21749181b742154a3be984caa5e29ab62410e9cf'
-          '07e1f5082faced4610ef97af2aacd52f583b9a5f'
-          'bf8a1fc54b5b68d0db14cdc3d7b76ef8500b1aaf')
+depends=('openssl' 'libconfig' 'protobuf-c')
+source=(
+  "http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
+  "${pkgname}.service"
+)
+sha256sums=(
+  '2c2a0c34defeda59bea437fb99ba1086f94e6156f9236cd3dcc1e198b42ef68f'
+  '86f396a042d02b9f9ed9f23596ed650ae7604d2de3e0f560f1f2fe03167fbbba'
+)
+install="${pkgname}.install"
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}  
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --mandir=/usr/share/man --with-ssl=openssl
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-
-  install -Dm644 umurmur.conf.example ${pkgdir}/etc/umurmur/umurmur.conf
-  install -Dm755 ${srcdir}/umurmur.rc.d ${pkgdir}/etc/rc.d/umurmur
-  install -Dm644 ${srcdir}/umurmur.conf.d ${pkgdir}/etc/conf.d/umurmur
-  install -Dm755 ${srcdir}/umurmur.service ${pkgdir}/usr/lib/systemd/system/umurmur.service
-  
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install || return 1
+  install -Dm644 'umurmur.conf.example' "${pkgdir}/etc/umurmur/umurmur.conf"
+  install -Dm644 "${srcdir}/umurmur.service" "${pkgdir}/usr/lib/systemd/system/umurmur.service"
 }
diff --git a/aur/umurmur/umurmur.install b/aur/umurmur/umurmur.install
new file mode 100644
index 000000000..41332e9ba
--- /dev/null
+++ b/aur/umurmur/umurmur.install
@@ -0,0 +1,13 @@
+post_install() {
+  getent group umurmur > /dev/null || groupadd -r umurmur 1>/dev/null
+  getent passwd umurmur > /dev/null || useradd -r -M -g umurmur -s /bin/false umurmur 1>/dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  getent passwd umurmur > /dev/null && userdel umurmur 1>/dev/null
+  getent group umurmur > /dev/null && groupdel umurmur 1>/dev/null
+}
diff --git a/aur/umurmur/umurmur.service b/aur/umurmur/umurmur.service
index dd4bee24a..329f16803 100644
--- a/aur/umurmur/umurmur.service
+++ b/aur/umurmur/umurmur.service
@@ -1,12 +1,15 @@
 [Unit]
-Description=Mumble Server
+Description=A minimalistic Mumble server
 After=network.target
 
 [Service]
-PIDFile=/run/umurmur.pid
-EnvironmentFile=/etc/conf.d/umurmur
-ExecStart=/usr/bin/umurmurd $UMURMUR_ARGS
+Type=simple
+User=umurmur
+Group=umurmur
+PIDFile=/run/umurmurd.pid
+ExecStartPre=/usr/bin/umurmurd -t -c /etc/umurmur/umurmur.conf
+ExecStart=/usr/bin/umurmurd -d -r -p /run/umurmurd.pid -c /etc/umurmur/umurmur.conf
+ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
 WantedBy=multi-user.target
-