diff --git a/contrib/Archlinux/fenrir b/contrib/Archlinux/fenrir
new file mode 160000
index 00000000..fcefe65e
--- /dev/null
+++ b/contrib/Archlinux/fenrir
@@ -0,0 +1 @@
+Subproject commit fcefe65ecd6812b7a39d8f6a4bf44805c2a9717a
diff --git a/contrib/Archlinux/fenrir-git b/contrib/Archlinux/fenrir-git
new file mode 160000
index 00000000..0537ad1a
--- /dev/null
+++ b/contrib/Archlinux/fenrir-git
@@ -0,0 +1 @@
+Subproject commit 0537ad1a8b9f73e6d58775ffc08f7625bc601fa3
diff --git a/contrib/fenrir-git/PKGBUILD b/contrib/fenrir-git/PKGBUILD
deleted file mode 100644
index 73c71042..00000000
--- a/contrib/fenrir-git/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Maintainer: Storm Dragon <stormdragon2976@gmail.com>
-# Maintainer: Chrys <mail@chrys.de>
-
-_gitname='fenrir'
-pkgname="${_gitname}-git"
-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-daemonize' 'python-evdev')
-optdepends=('brltty: For Braille support'
-'gstreamer: for soundicons via gstreamer'
-  'sox: The default sound driver'
-  'python-espeak: TTS support'
-  'python-pyenchant: for spell check functionality'
-  'speech-dispatcher: TTS support')
-makedepends=('git')
-provides=('fenrir')
-conflicts=('fenrir')
-install="$pkgname".install
-source=("git+https://github.com/chrys87/${_gitname}.git"
-  'fenrir-git.install')
-md5sums=('SKIP'
-         '1387fd3851040d03816e2fb6b8fa631f')
-
-pkgver()
-{
-  cd "$srcdir/$_gitname"
-  local ver="$(git describe --tags)"
-  echo "${ver//-/.}"
-}
-
-package()
-{
-  cd "$srcdir/$_gitname"
-  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"
-  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"
-}
-
-# vim: set ts=2 sw=2 et:
diff --git a/contrib/fenrir-git/fenrir-git.install b/contrib/fenrir-git/fenrir-git.install
deleted file mode 100644
index 8d6d9877..00000000
--- a/contrib/fenrir-git/fenrir-git.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-ln -s /opt/fenrir/fenrir-daemon /usr/bin/fenrir
-_alert
-}
-
-_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
-}
-