diff --git a/community/opendht/PKGBUILD b/community/opendht/PKGBUILD
index 7fcd33f8c..84e5107dc 100644
--- a/community/opendht/PKGBUILD
+++ b/community/opendht/PKGBUILD
@@ -7,8 +7,8 @@
 
 pkgname=opendht
 epoch=1
-pkgver=2.1.6
-pkgrel=3
+pkgver=2.1.9.5
+pkgrel=1
 pkgdesc="C++14 Distributed Hash Table (DHT) implementation"
 arch=(x86_64)
 url="https://github.com/savoirfairelinux/opendht"
@@ -16,19 +16,19 @@ license=(GPL3)
 depends=(openssl gnutls nettle argon2 readline fmt http-parser jsoncpp libjsoncpp.so)
 makedepends=(msgpack-c cmake cython cppunit restinio)
 optdepends=('python: to use the Python bindings')
-source=("${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('53f362f75a5dda2e88eb145671d01b2998cc5f55d9e1e37fa28b18a324f1159c')
+source=(${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz
+        ${pkgname}-fix-systemd-makedep.patch::${url}/pull/535.patch)
+sha256sums=('74eb58f0589577a9df378772f1dd2edc1c3f1b16a045057c3bcb120d2c16403f'
+            '7774b345aa48f948bb0dcca3cd4341da53b8a0df8f8ba96440e9a0b0776e40e9')
 
 prepare() {
-  mkdir -p build
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../${pkgname}-fix-systemd-makedep.patch
 }
 
 build() {
-  cd build
-
-  [[ $CARCH == "arm" || $CARCH == "armv6h" ]] && echo "target_link_libraries(opendht PRIVATE atomic)" >> ../${pkgname}-${pkgver}/CMakeLists.txt
-
-  cmake ../${pkgname}-${pkgver} \
+  [[ $CARCH == "arm" || $CARCH == "armv6h" ]] && echo "target_link_libraries(opendht PRIVATE atomic)" >> ${pkgname}-${pkgver}/CMakeLists.txt
+  cmake -B build -S ${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
@@ -45,15 +45,13 @@ build() {
     -DOPENDHT_PROXY_SERVER=ON \
     -DOPENDHT_PROXY_CLIENT=ON \
     -DOPENDHT_PUSH_NOTIFICATIONS=ON
-  make
+  make -C build
 }
 
 #check() {
-#  cd build
-#  make test
+#  make -C build test
 #}
 
 package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
+  make -C build DESTDIR="${pkgdir}" install
 }