diff --git a/src/biboumi/.SRCINFO b/src/biboumi-git/.SRCINFO
similarity index 62%
rename from src/biboumi/.SRCINFO
rename to src/biboumi-git/.SRCINFO
index de65cab..413484e 100644
--- a/src/biboumi/.SRCINFO
+++ b/src/biboumi-git/.SRCINFO
@@ -1,28 +1,30 @@
 # Generated by mksrcinfo v8
-# Wed Nov  9 17:07:34 UTC 2016
-pkgbase = biboumi
+# Fri Jan  6 15:12:43 UTC 2017
+pkgbase = biboumi-git
 	pkgdesc = XMPP gateway to IRC
-	pkgver = 4.0
+	pkgver = r885.5b56007
 	pkgrel = 1
 	url = https://biboumi.louiz.org/
 	install = biboumi.install
 	arch = i686
 	arch = x86_64
 	arch = armv7h
-	arch = aarch64
 	license = ZLIB
+	makedepends = git
 	makedepends = cmake
 	makedepends = pandoc
 	depends = expat
 	depends = libidn
-	depends = c-ares
+	depends = udns
 	depends = botan
 	depends = litesql-git
+	provides = biboumi=3.99
+	conflicts = biboumi
 	backup = etc/biboumi/biboumi.cfg
-	source = https://git.louiz.org/biboumi/snapshot/biboumi-4.0.tar.xz
+	source = biboumi::git+https://git.louiz.org/biboumi.git
 	source = sysuser.conf
-	md5sums = 064958f1a8663ad72010e7209dbd5fd1
+	md5sums = SKIP
 	md5sums = 07c92af3248861ce94d361e98cfb7f5c
 
-pkgname = biboumi
+pkgname = biboumi-git
 
diff --git a/src/biboumi-git/PKGBUILD b/src/biboumi-git/PKGBUILD
new file mode 100644
index 0000000..a9f6a8b
--- /dev/null
+++ b/src/biboumi-git/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
+
+_pkgname=biboumi
+pkgname="$_pkgname-git"
+pkgver=r897.45f7396
+pkgrel=1
+pkgdesc="XMPP gateway to IRC"
+arch=('i686' 'x86_64' 'armv7h')
+url="https://biboumi.louiz.org/"
+license=('ZLIB')
+depends=('expat' 'libidn' 'udns' 'botan' 'litesql-git')
+makedepends=('git' 'cmake' 'pandoc')
+backup=("etc/$_pkgname/$_pkgname.cfg")
+install="$_pkgname.install"
+source=("$_pkgname::git+https://git.louiz.org/biboumi.git"
+        'sysuser.conf')
+md5sums=('SKIP'
+         '07c92af3248861ce94d361e98cfb7f5c')
+
+provides=("$_pkgname=3.99")
+conflicts=("$_pkgname")
+
+pkgver() {
+  cd "$srcdir/$_pkgname"
+  echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+  cd "$srcdir/$_pkgname"
+  mkdir -p build
+}
+
+build() {
+  cd "$srcdir/$_pkgname/build"
+  cmake .. \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSERVICE_USER=biboumi \
+    -DSERVICE_GROUP=jabber
+  make biboumi
+}
+
+package() {
+  cd "$srcdir/$_pkgname/build"
+  make DESTDIR="$pkgdir/" install
+
+  cd "$srcdir/$_pkgname"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
+  install -Dm644 doc/biboumi.1.rst "$pkgdir/usr/share/doc/$_pkgname/$_pkgname.rst"
+
+  cd "$srcdir"
+  install -Dm644 sysuser.conf "$pkgdir/usr/lib/sysusers.d/$_pkgname.conf"
+}
diff --git a/src/biboumi/biboumi.install b/src/biboumi-git/biboumi.install
similarity index 100%
rename from src/biboumi/biboumi.install
rename to src/biboumi-git/biboumi.install
diff --git a/src/biboumi/sysuser.conf b/src/biboumi-git/sysuser.conf
similarity index 100%
rename from src/biboumi/sysuser.conf
rename to src/biboumi-git/sysuser.conf
diff --git a/src/biboumi/PKGBUILD b/src/biboumi/PKGBUILD
deleted file mode 100644
index 6f70d9c..0000000
--- a/src/biboumi/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
-
-pkgname=biboumi
-pkgver=4.0
-pkgrel=1
-pkgdesc="XMPP gateway to IRC"
-arch=('i686' 'x86_64' 'armv7h' 'aarch64')
-url="https://biboumi.louiz.org/"
-license=('ZLIB')
-depends=('expat' 'libidn' 'c-ares' 'botan' 'litesql-git')
-makedepends=('cmake' 'pandoc')
-backup=("etc/$pkgname/$pkgname.cfg")
-install="$pkgname.install"
-source=("https://git.louiz.org/biboumi/snapshot/$pkgname-$pkgver.tar.xz"
-        'sysuser.conf')
-md5sums=('064958f1a8663ad72010e7209dbd5fd1'
-         '07c92af3248861ce94d361e98cfb7f5c')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mkdir -p build
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver/build"
-  cmake .. \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSERVICE_USER=biboumi \
-    -DSERVICE_GROUP=jabber
-  make biboumi
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
-  make DESTDIR="$pkgdir/" install
-
-  cd "$srcdir/$pkgname-$pkgver"
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -Dm644 doc/biboumi.1.rst "$pkgdir/usr/share/doc/$pkgname/$pkgname.rst"
-
-  cd "$srcdir"
-  install -Dm644 sysuser.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-}