diff --git a/gerbera/default/PKGBUILD b/gerbera/default/PKGBUILD
new file mode 100644
index 00000000..b5a7be80
--- /dev/null
+++ b/gerbera/default/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Sergej Pupykin <arch+pub@sergej.pp.ru>
+# Contributor: sulaweyo <sledge.sulaweyo@gmail.com>
+# Contributor: Francois Menning <f.menning@pm.me>
+
+# Modified by: Martchus <martchus@gmx.net>
+# * Use ninja
+# * Make libmariadbclient a regular dependency (having it as an optional dependency makes no
+#   sense because it is not a plugin).
+# * Improve formatting; don't mix tabs and spaces.
+
+pkgname=gerbera
+pkgver=1.6.1
+pkgrel=1
+pkgdesc='UPnP Media Server (based on MediaTomb)'
+arch=(i686 x86_64 armv7h)
+url="https://github.com/gerbera/gerbera"
+license=('GPL2')
+depends=('taglib' 'curl' 'sqlite' 'file' 'gcc-libs' 'libupnp1.12' 'duktape' 'libexif' 'fmt' 'pugixml'
+         'spdlog' 'ffmpeg' 'ffmpegthumbnailer' 'libmatroska' 'libmariadbclient')
+#optdepends=('libmariadbclient')
+makedepends=('cmake' 'ninja')
+install=gerbera.install
+options=('emptydirs')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/gerbera/gerbera/archive/v$pkgver.tar.gz"
+        gerbera.sysusers
+        gerbera.tmpfiles)
+sha256sums=('9bb119ee422c8e7a053c309256215a8899dfd6707f6b93496e6facea7978ac7c'
+            '0b55a4e1886f7aad0528446658433327815fd3f4d06e260518423f86dbe32dcc'
+            '452f5d4b5661e0262cb4a48d62a54f5f26d53c6d3aebf502cde072214a8b30d8')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  sed -i 's/${PC_UPNP_LIBRARIES}//g' cmake/Findpupnp.cmake
+  export PKG_CONFIG_PATH="/usr/lib/libupnp-1.12/pkgconfig/:${PKG_CONFIG_PATH}"
+
+  # build options can be found here: https://github.com/gerbera/gerbera/blob/master/CMakeLists.txt
+  cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/usr -DWITH_AVCODEC=1 -DWITH_FFMPEGTHUMBNAILER=1 -DWITH_MYSQL=1 .
+  ninja
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  DESTDIR="${pkgdir}/" ninja install
+
+  install -dm0755 "${pkgdir}"/var/lib/gerbera
+  install -dm0755 "${pkgdir}"/etc/gerbera
+  install -Dm0644 "${srcdir}/${pkgname}".tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
+  install -Dm0644 "${srcdir}/${pkgname}".sysusers "${pkgdir}"/usr/lib/sysusers.d/gerbera.conf
+}
diff --git a/gerbera/default/gerbera.install b/gerbera/default/gerbera.install
new file mode 100644
index 00000000..ff316fd2
--- /dev/null
+++ b/gerbera/default/gerbera.install
@@ -0,0 +1,12 @@
+post_install() {
+  echo ":: You need to generate a configuration file before running gerbera, e.g.:"
+  echo "   gerbera --create-config | sudo tee /etc/gerbera/config.xml"
+  echo "   chown -R gerbera:gerbera /etc/gerbera"
+  echo ":: Make sure <home> points to /etc/gerbera in /etc/gerbera/config.xml:"
+  echo " <home>/etc/gerbera</home>"
+}
+
+post_upgrade() {
+  echo ":: Version 1.2.0-3 of gerbera switched to the packages systemd unit."
+  echo "   Please check your config before you start gerbera."
+}
diff --git a/gerbera/default/gerbera.sysusers b/gerbera/default/gerbera.sysusers
new file mode 100644
index 00000000..b4b331c7
--- /dev/null
+++ b/gerbera/default/gerbera.sysusers
@@ -0,0 +1,2 @@
+u gerbera   -      "Gerbera daemon user" /var/lib/gerbera
+m gerbera video
diff --git a/gerbera/default/gerbera.tmpfiles b/gerbera/default/gerbera.tmpfiles
new file mode 100644
index 00000000..10c5bc09
--- /dev/null
+++ b/gerbera/default/gerbera.tmpfiles
@@ -0,0 +1,4 @@
+d /var/lib/gerbera 0750
+Z /var/lib/gerbera - gerbera gerbera
+z /etc/gerbera 0755 gerbera gerbera
+z /etc/gerbera/config.xml 0660 gerbera gerbera