diff --git a/cppdap/PKGBUILD b/cppdap/PKGBUILD
index dd4d6d8e93..0deb622516 100644
--- a/cppdap/PKGBUILD
+++ b/cppdap/PKGBUILD
@@ -3,24 +3,26 @@
 
 pkgname=cppdap
 pkgver=1.58.0
-pkgrel=1
+pkgrel=2
 pkgdesc='C++ library for the Debug Adapter Protocol'
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url='https://github.com/google/cppdap'
-license=(Apache)
-depends=(gcc-libs)
-makedepends=(cmake nlohmann-json)
-source=(https://github.com/google/cppdap/archive/dap-$pkgver-a.tar.gz
-        https://github.com/google/cppdap/commit/6a3cc9a8.patch)
-sha256sums=('5d35ca5db78570b6bef698e3365f79bd82a4f78e8393546387f78d7bdb2a2a08'
-            '7c1bed285d8bb2400ae46def282a4736b9afcb74bb3e96663fac97b73dea3cb4')
+license=(Apache-2.0)
+depends=(gcc-libs
+         glibc)
+makedepends=(cmake
+             git
+             nlohmann-json)
+source=(git+https://github.com/google/cppdap#tag=dap-$pkgver-a)
+sha256sums=('84c59af16b1fa109223c64ee44c5df12a9c3d3b4fab90cacd20a2b4efd048554')
 
 prepare() {
-  patch -d cppdap-dap-$pkgver-a -p1 < 6a3cc9a8.patch # Build shared lib
+  cd cppdap
+  git cherry-pick -n 6a3cc9a8 # Build shared lib
 }
 
 build() {
-  cmake -B build -S cppdap-dap-$pkgver-a \
+  cmake -B build -S cppdap \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=ON \
     -DBUILD_SHARED_LIBS=ON