diff --git a/main/cppdap/.checksums b/main/cppdap/.checksums
index 40a0ebe39..b4cf0e33d 100644
--- a/main/cppdap/.checksums
+++ b/main/cppdap/.checksums
@@ -1,2 +1,2 @@
 8b0967f4db5e12e859202e0d5dd27a20  6a3cc9a8.patch
-24465ac50c76a19565f07f4a723b78cb  dap-1.58.0-a.tar.gz
+24465ac50c76a19565f07f4a723b78cb  cppdap-1.58.0.tar.gz
diff --git a/main/cppdap/6a3cc9a8.patch b/main/cppdap/6a3cc9a8.patch
new file mode 100644
index 000000000..1c3d1d448
--- /dev/null
+++ b/main/cppdap/6a3cc9a8.patch
@@ -0,0 +1,24 @@
+From 6a3cc9a804e83c40f4202fe6a34c8911d2c7c12b Mon Sep 17 00:00:00 2001
+From: Julien Schueller <schueller@phimeca.com>
+Date: Thu, 13 Jul 2023 19:36:52 +0200
+Subject: [PATCH] CMake: Allow to build dynamic lib
+
+This allows taking cmake BUILD_SHARED_LIBS option to decide whether to build a shared or static lib
+This does not change the default (static)
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 717f02e..3a14f59 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -226,7 +226,7 @@ endfunction(cppdap_set_target_options)
+ ###########################################################
+ 
+ # dap
+-add_library(cppdap STATIC ${CPPDAP_LIST})
++add_library(cppdap ${CPPDAP_LIST})
+ set_target_properties(cppdap PROPERTIES POSITION_INDEPENDENT_CODE 1)
+ 
+ cppdap_set_target_options(cppdap)
diff --git a/main/cppdap/spkgbuild b/main/cppdap/spkgbuild
index 6340ca34d..db0cdd84b 100644
--- a/main/cppdap/spkgbuild
+++ b/main/cppdap/spkgbuild
@@ -5,8 +5,8 @@
 name=cppdap
 version=1.58.0
 release=1
-source="https://github.com/google/cppdap/archive/dap-${version}-a.tar.gz
-        https://github.com/google/cppdap/commit/6a3cc9a8.patch"
+source="$name-$version.tar.gz::https://github.com/google/cppdap/archive/dap-${version}-a.tar.gz
+        6a3cc9a8.patch"
 
 build() {
 	patch -d cppdap-dap-${version}-a -p1 < 6a3cc9a8.patch # Build shared lib