diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 0ee0f47..3c5722a 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc='High-performance, extensible DHCP server engine from ISC, supporting bo
 arch=('x86_64')
 url='https://kea.isc.org'
 license=('MPL2')
-depends=('boost-libs' 'log4cplus' 'mariadb-libs' 'openssl' 'postgresql-libs')
+depends=('log4cplus' 'mariadb-libs' 'openssl' 'postgresql-libs')
 makedepends=(
   'boost'
   'mariadb'
@@ -19,6 +19,7 @@ makedepends=(
   'python-sphinx'
   'python-sphinx_rtd_theme'
   'doxygen'
+  'graphviz'
   # texlive-most group
   'texlive-bibtexextra'
   'texlive-core'
@@ -40,16 +41,7 @@ optdepends=('mariadb: lease information database'
             'kea-docs: user and developer documentation')
 # Checks are disabled for now
 # We can ignore mysql/pgsql, but admin tests use custom scripts that break everything
-checkdepends=('benchmark' 'gtest' 'procps-ng') # procps-ng needed for 'pgrep'
-backup=(
-  # New config files as of Kea 1.3
-  'etc/kea/kea-dhcp4.conf'
-  'etc/kea/kea-dhcp6.conf'
-  'etc/kea/kea-dhcp-ddns.conf'
-  'etc/kea/keactrl.conf'
-  'etc/kea/kea-ctrl-agent.conf'
-  'etc/kea/kea-netconf.conf'
-)
+checkdepends=('gtest' 'procps-ng') # procps-ng needed for 'pgrep'
 install=kea.install
 source=(
   "https://ftp.isc.org/isc/${pkgbase}/${_upstreamver}/${pkgbase}-${_upstreamver}.tar.gz"{,.asc}
@@ -74,39 +66,31 @@ validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57'  # Internet Systems Con
 
 build() {
   cd "${srcdir}/${pkgbase}-${_upstreamver}"
-  # make sure Google Benchmark can be linked to
-  sed -e 's/dir\/lib\/libbenchmark.a/dir\/lib\/libbenchmark.so/g' \
-      -e 's/BENCHMARK_LDADD="$dir\/lib\/libbenchmark.so/BENCHMARK_LDADD="-lbenchmark/' \
-      -i configure.ac
-  autoreconf --install
   ./configure \
       --prefix='/usr' \
       --sbindir='/usr/bin' \
       --libexecdir='/usr/bin' \
       --sysconfdir='/etc' \
       --localstatedir='/var' \
-      --enable-benchmark \
+      --runstatedir='/run' \
       --enable-perfdhcp \
       --enable-generate-messages \
       --enable-generate-parser \
       --enable-generate-docs \
       --enable-shell \
+      --disable-static \
       --with-openssl \
       --with-gtest \
-      --with-benchmark \
       --with-mysql \
       --with-pgsql \
       --with-gssapi \
       --with-log4cplus
   # do not treat sphinx warnings as errors
   sed -e 's/sphinxopts = -v -E -a -W/sphinxopts = -v -E -a/g' \
-      -i doc/Makefile.in \
-      -i doc/Makefile \
-      -i doc/sphinx/Makefile.in \
       -i doc/sphinx/Makefile
+  # prevent libtool overlinking
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
-  make -C doc
-  make -C doc/sphinx
   make -C doc/devel devel
 }
 
@@ -119,11 +103,19 @@ check() {
 }
 
 package_kea() {
+  backup=(
+    # New config files as of Kea 1.3
+    'etc/kea/kea-dhcp4.conf'
+    'etc/kea/kea-dhcp6.conf'
+    'etc/kea/kea-dhcp-ddns.conf'
+    'etc/kea/keactrl.conf'
+    'etc/kea/kea-ctrl-agent.conf'
+)
+
   cd "${srcdir}/kea-${_upstreamver}"
   make DESTDIR="${pkgdir}" install
-  # Handle /var/run -> /run symlink
-  rmdir "${pkgdir}"/var/run/kea
-  rmdir "${pkgdir}"/var/run
+  # Do not package /run
+  rm -r "${pkgdir}"/run
   install -Dm644 "${srcdir}"/tmpfiles-kea.conf "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
   # Systemd service files
   install -Dm644 "${srcdir}"/kea-dhcp4.service "${pkgdir}"/usr/lib/systemd/system/kea-dhcp4.service
@@ -131,7 +123,7 @@ package_kea() {
   install -Dm644 "${srcdir}"/kea-dhcp-ddns.service "${pkgdir}"/usr/lib/systemd/system/kea-dhcp-ddns.service
   install -Dm644 "${srcdir}"/kea-ctrl-agent.service "${pkgdir}"/usr/lib/systemd/system/kea-ctrl-agent.service
   # split docs in a separate package
-  rm -rf "${pkgdir}"/usr/share/doc
+  rm -r "${pkgdir}"/usr/share/{doc,man}
 }
 
 package_kea-docs() {
@@ -139,11 +131,10 @@ package_kea-docs() {
   optdepends=()
   provides=('kea-devel-docs')
   replaces=('kea-devel-docs')
+
   cd "${srcdir}/${pkgbase}-${_upstreamver}"
   install -d "${pkgdir}/usr/share/doc/${pkgbase}/"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,var,usr/{bin,lib,include,share/kea}}
   make DESTDIR="${pkgdir}" -C doc install
-  make DESTDIR="${pkgdir}" -C doc/devel install
   cp -r doc/devel/html "${pkgdir}/usr/share/doc/${pkgbase}/devel"
+  rm "${pkgdir}"/usr/share/doc/kea/devel/doxygen{,-error}.log
 }