diff --git a/dendrite-git/.SRCINFO b/dendrite-git/.SRCINFO
new file mode 100644
index 0000000..0b8c685
--- /dev/null
+++ b/dendrite-git/.SRCINFO
@@ -0,0 +1,22 @@
+pkgbase = dendrite-git
+	pkgdesc = A second-generation Matrix homeserver written in Go
+	pkgver = 0.3.11.r39.g81d60d544
+	pkgrel = 1
+	url = https://github.com/matrix-org/dendrite
+	arch = x86_64
+	license = Apache
+	makedepends = git
+	makedepends = go
+	provides = dendrite
+	conflicts = dendrite
+	source = git+https://github.com/matrix-org/dendrite.git
+	source = dendrite.sysusers
+	source = tmpfiles-dendrite.conf
+	source = dendrite.service
+	sha256sums = SKIP
+	sha256sums = aba328d7a7244e82f866f9d0ead0a53e79e1590b9c449ad6d18ff2659cb5e035
+	sha256sums = 7d3b8e046581c70857d452eb6569ea239989c7a47f818c184773b52df8a712dc
+	sha256sums = 562a89c61d4f54a2558024f755497a3a59b1c85e236924131fdf58724ed25f3f
+
+pkgname = dendrite-git
+
diff --git a/dendrite-git/PKGBUILD b/dendrite-git/PKGBUILD
new file mode 100644
index 0000000..312f3e1
--- /dev/null
+++ b/dendrite-git/PKGBUILD
@@ -0,0 +1,62 @@
+# Maintainer: Cedric Girard <cgirard [dot] archlinux [at] valinor [dot] fr>
+# Contributor: Stefan Tatschner <stefan@rumpelsepp.org>
+
+pkgname=dendrite-git
+_gitname=dendrite
+pkgver=0.3.11.r39.g81d60d544
+pkgrel=1
+pkgdesc="A second-generation Matrix homeserver written in Go"
+arch=('x86_64')
+url='https://github.com/matrix-org/dendrite'
+license=('Apache')
+makedepends=('git' 'go')
+provides=('dendrite')
+conflicts=('dendrite')
+source=("git+https://github.com/matrix-org/${_gitname}.git"
+        "dendrite.sysusers"
+        "tmpfiles-dendrite.conf"
+        "dendrite.service")
+sha256sums=('SKIP'
+            'aba328d7a7244e82f866f9d0ead0a53e79e1590b9c449ad6d18ff2659cb5e035'
+            '7d3b8e046581c70857d452eb6569ea239989c7a47f818c184773b52df8a712dc'
+            '562a89c61d4f54a2558024f755497a3a59b1c85e236924131fdf58724ed25f3f')
+
+pkgver() {
+  cd ${_gitname}
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+build() {
+  cd ${_gitname}
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+  go build ./cmd/dendrite-monolith-server
+  go build ./cmd/generate-config
+  go build ./cmd/generate-keys
+  go build ./cmd/create-account
+}
+
+check() {
+  cd ${_gitname}
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+  go test ./cmd/dendrite-monolith-server
+}
+
+package() {
+  cd ${_gitname}
+  install -Dm755 ./dendrite-monolith-server           "${pkgdir}/usr/bin/${_gitname}"
+  install -Dm755 ./generate-config                    "${pkgdir}/usr/bin/${_gitname}-generate-config"
+  install -Dm755 ./generate-keys                      "${pkgdir}/usr/bin/${_gitname}-generate-keys"
+  install -Dm755 ./create-account                      "${pkgdir}/usr/bin/${_gitname}-create-account"
+  install -Dm644 ./dendrite-config.yaml       "${pkgdir}/etc/dendrite/config-sample.yaml"
+  install -Dm644 "${srcdir}/dendrite.service"         "${pkgdir}/usr/lib/systemd/system/${_gitname}.service"
+  install -Dm644 "${srcdir}/${_gitname}.sysusers"      "${pkgdir}/usr/lib/sysusers.d/${_gitname}.conf"
+  install -Dm644 "${srcdir}/tmpfiles-${_gitname}.conf" "${pkgdir}/usr/lib/tmpfiles.d/${_gitname}.conf"
+}
diff --git a/dendrite-git/dendrite.service b/dendrite-git/dendrite.service
new file mode 100644
index 0000000..a658331
--- /dev/null
+++ b/dendrite-git/dendrite.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Dendrite (Matrix Homeserver)
+After=network.target
+After=postgresql.service
+Wants=postgresql.service
+
+[Service]
+User=dendrite
+Group=dendrite
+ExecStart=/usr/bin/dendrite --config=/etc/dendrite/config.yaml
+WorkingDirectory=/var/lib/dendrite/
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dendrite-git/dendrite.sysusers b/dendrite-git/dendrite.sysusers
new file mode 100644
index 0000000..c339b63
--- /dev/null
+++ b/dendrite-git/dendrite.sysusers
@@ -0,0 +1 @@
+u dendrite - "Matrix Dendrite User" /var/lib/dendrite
diff --git a/dendrite-git/tmpfiles-dendrite.conf b/dendrite-git/tmpfiles-dendrite.conf
new file mode 100644
index 0000000..056ecb2
--- /dev/null
+++ b/dendrite-git/tmpfiles-dendrite.conf
@@ -0,0 +1,2 @@
+d /var/lib/dendrite 0700 dendrite dendrite -
+d /var/log/dendrite 0700 dendrite dendrite -