diff --git a/contrib/fenrir-git/PKGBUILD b/contrib/fenrir-git/PKGBUILD
index 09fbdcf5..73c71042 100644
--- a/contrib/fenrir-git/PKGBUILD
+++ b/contrib/fenrir-git/PKGBUILD
@@ -3,17 +3,19 @@
 
 _gitname='fenrir'
 pkgname="${_gitname}-git"
-pkgver=v0.1.2.gb72614a
-pkgrel=1
+pkgver=v0.2.5.g33af5b6
+pkgrel=3
 pkgdesc='A user space console screen reader written in python3'
 arch=('any')
 url='https://github.com/chrys87/${_pkgname}'
 license=('MIT')
-depends=('python' 'python-espeak' 'python-evdev')
+depends=('python' 'python-daemonize' 'python-evdev')
 optdepends=('brltty: For Braille support'
-  'gstreamer: for soundicons via gstreamer'
+'gstreamer: for soundicons via gstreamer'
   'sox: The default sound driver'
-  'python-enchant: for spell check functionality')
+  'python-espeak: TTS support'
+  'python-pyenchant: for spell check functionality'
+  'speech-dispatcher: TTS support')
 makedepends=('git')
 provides=('fenrir')
 conflicts=('fenrir')
@@ -21,7 +23,7 @@ install="$pkgname".install
 source=("git+https://github.com/chrys87/${_gitname}.git"
   'fenrir-git.install')
 md5sums=('SKIP'
-         '9d1e82fce2e02ae2a1216a18ca576bfb')
+         '1387fd3851040d03816e2fb6b8fa631f')
 
 pkgver()
 {
@@ -33,17 +35,19 @@ pkgver()
 package()
 {
   cd "$srcdir/$_gitname"
-  install -d "$pkgdir/usr/bin"
- install -d "$pkgdir/etc/fenrir/keyboard"
- install -d "$pkgdir/etc/fenrir/settings"
- install -d "$pkgdir/etc/fenrir/substitution"
+  install -m755 -d "$pkgdir/opt/fenrir"
+ install -m755 -d "$pkgdir/usr/share/fenrir/scripts"
+ install -m755 -d "$pkgdir/usr/share/fenrir/tools"
+ install -m644 -D "config/keyboard/desktop.conf" "$pkgdir/etc/fenrir/keyboard/desktop.conf"
+ install -m644 -D "config/keyboard/laptop.conf" "$pkgdir/etc/fenrir/keyboard/laptop.conf"
+ install -m644 -D "config/punctuation/default.conf" "$pkgdir/etc/fenrir/punctuation/default.conf"
+ install -m644 -D "config/settings/settings.conf" "$pkgdir/etc/fenrir/settings/settings.conf"
  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 src/fenrir/* "$pkgdir/opt/fenrir"
+  cp -a config/scripts/* "$pkgdir/usr/share/fenrir/scripts"
+  cp -a tools/* "$pkgdir/usr/share/fenrir/tools"
   cp -a config/sound/* "$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-git.install b/contrib/fenrir-git/fenrir-git.install
index 973d87ac..8d6d9877 100644
--- a/contrib/fenrir-git/fenrir-git.install
+++ b/contrib/fenrir-git/fenrir-git.install
@@ -1,4 +1,5 @@
 post_install() {
+ln -s /opt/fenrir/fenrir-daemon /usr/bin/fenrir
 _alert
 }
 
@@ -6,6 +7,9 @@ _alert() {
 cat << EOF
 To have fenrir start at boot:
 sudo systemctl enable fenrir
+Pulseaudio users may want to run
+/usr/share/fenrir/tools/configure-pulseaudio
+once as their user account and once as root.
 EOF
 }