diff --git a/contrib/fenrir-git/PKGBUILD b/contrib/fenrir-git/PKGBUILD
index 3fe59c46..c726b40c 100644
--- a/contrib/fenrir-git/PKGBUILD
+++ b/contrib/fenrir-git/PKGBUILD
@@ -3,10 +3,10 @@
 
 _gitname='fenrir'
 pkgname="${_gitname}-git"
-pkgver=v0.71.117.g4d87b22
+pkgver=v0.1.2.gb72614a
 pkgrel=1
 pkgdesc='A user space console screen reader written in python3'
-arch=('armv7' 'i686' 'x86_64')
+arch=('armv7h' 'i686' 'x86_64')
 url='https://github.com/chrys87/${_pkgname}'
 license=('MIT')
 depends=('python' 'python-espeak' 'python-evdev')
@@ -19,9 +19,9 @@ provides=('fenrir')
 conflicts=('fenrir')
 install="$pkgname".install
 source=("git+https://github.com/chrys87/${_gitname}.git"
-  'fenrir.service'
-  'fenrir.sh'
   'fenrir-git.install')
+md5sums=('SKIP'
+         '9d1e82fce2e02ae2a1216a18ca576bfb')
 
 pkgver()
 {
@@ -34,8 +34,16 @@ package()
 {
   cd "$srcdir/$_gitname"
   install -d "$pkgdir/usr/bin"
- install -d "$pkgdir/etc/fenrir"
-
+ install -d "$pkgdir/etc/fenrir/keyboard"
+ install -d "$pkgdir/etc/fenrir/settings"
+ install -d "$pkgdir/etc/fenrir/substitution"
+ install -d "$pkgdir/usr/share/sounds/fenrir"
+  install -m644 -D "autostart/systemd/fenrir.service" "$pkgdir/usr/lib/systemd/system/fenrir.service"
+  python setup.py install --root="${pkgdir}/" --optimize=1
+  cp -a config/keyboard/* "$pkgdir/etc/fenrir/keyboard"
+  cp -a config/settings/* "$pkgdir/etc/fenrir/settings"
+  cp -a config/sounds/* "$pkgdir/usr/share/sounds/fenrir"
+  cp -a config/substitution/* "$pkgdir/etc/fenrir/substitution"
 }
 
 # vim: set ts=2 sw=2 et:
diff --git a/contrib/fenrir-git/fenrir.service b/contrib/fenrir-git/fenrir.service
deleted file mode 100644
index f79dd40c..00000000
--- a/contrib/fenrir-git/fenrir.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Fenrir screenreader
-
-[Service]
-Type=forking
-PIDFile=/var/run/fenrir.pid
-ExecStart=/usr/bin/fenrir
-Restart=on-abort
-#Group=fenrir
-#User=fenrir
-
-[Install]
-WantedBy=sound.target
diff --git a/contrib/fenrir-git/fenrir.sh b/contrib/fenrir-git/fenrir.sh
deleted file mode 100644
index eb8d596f..00000000
--- a/contrib/fenrir-git/fenrir.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-cd fenrir/
-python3 fenrir.py
-