diff --git a/devel/libddwaf/Makefile b/devel/libddwaf/Makefile
index 55dd527244c89..447d0330c3f6f 100644
--- a/devel/libddwaf/Makefile
+++ b/devel/libddwaf/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libddwaf
-PORTVERSION=	1.11.0
+PORTVERSION=	1.12.0
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libac.so:devel/libac \
 		libutf8proc.so:textproc/utf8proc \
 		libyaml-cpp.so:devel/yaml-cpp
 
-USES=		cmake compiler:c++17-lang localbase:ldflags
+USES=		cmake compiler:c++20-lang localbase:ldflags
 
 CMAKE_OFF=	LIBDDWAF_KEEP_SYMBOL_FILE LIBDDWAF_TESTING
 CMAKE_ON=	LIBDDWAF_BUILD_SHARED LIBDDWAF_BUILD_STATIC
@@ -28,7 +28,7 @@ CMAKE_ON=	LIBDDWAF_BUILD_SHARED LIBDDWAF_BUILD_STATIC
 USE_GITHUB=	yes
 GH_ACCOUNT=	DataDog
 GH_TUPLE=	DataDog:appsec-event-rules:1.7.1:DataDog_appsec_event_rules/third_party/proj_event_rules \
-		Tencent:rapidjson:973dc9c:Tencent_rapidjson/third_party/rapidjson
+		Tencent:rapidjson:a95e013:Tencent_rapidjson/third_party/rapidjson
 
 post-patch:
 # Clean up bundled libraries
diff --git a/devel/libddwaf/distinfo b/devel/libddwaf/distinfo
index 71ed1a5ddf11a..2251211e65002 100644
--- a/devel/libddwaf/distinfo
+++ b/devel/libddwaf/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1685162032
-SHA256 (DataDog-libddwaf-1.11.0_GH0.tar.gz) = 5cf1b14fd9fe7e93bbfed8adbbbdfe4a9a14a54bcd278a95abe298768fcf3ad8
-SIZE (DataDog-libddwaf-1.11.0_GH0.tar.gz) = 733209
+TIMESTAMP = 1691069924
+SHA256 (DataDog-libddwaf-1.12.0_GH0.tar.gz) = 68000b76f44118fe726750df3a54effc987def5b368be002c495383df9437ac4
+SIZE (DataDog-libddwaf-1.12.0_GH0.tar.gz) = 745164
 SHA256 (DataDog-appsec-event-rules-1.7.1_GH0.tar.gz) = df0e72ec448f66f7752c0f6c411b8172751524eaae66b9219a477668e1e65f91
 SIZE (DataDog-appsec-event-rules-1.7.1_GH0.tar.gz) = 134403
-SHA256 (Tencent-rapidjson-973dc9c_GH0.tar.gz) = f69cec879316045c53e7a54518e126348e2c029a775d7e4f65ea88f43c6a4d01
-SIZE (Tencent-rapidjson-973dc9c_GH0.tar.gz) = 1115411
+SHA256 (Tencent-rapidjson-a95e013_GH0.tar.gz) = 44d777549051b4dabea4dd2290d6b63a340c103e819da0c85f658606f4e88b6a
+SIZE (Tencent-rapidjson-a95e013_GH0.tar.gz) = 1115459
diff --git a/devel/libddwaf/files/patch-CMakeLists.txt b/devel/libddwaf/files/patch-CMakeLists.txt
index d66eb36faad9d..7409c74399cc0 100644
--- a/devel/libddwaf/files/patch-CMakeLists.txt
+++ b/devel/libddwaf/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2023-05-25 10:34:56 UTC
+--- CMakeLists.txt.orig	2023-07-28 08:52:50 UTC
 +++ CMakeLists.txt
 @@ -8,23 +8,23 @@ set(CMAKE_PROJECT_VERSION ${version})
  configure_file(src/version.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/src/version.hpp)
@@ -14,7 +14,7 @@
 +#endif()
  
  set(CMAKE_C_STANDARD 99)
- set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD 20)
  set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
  
 -set(LIBDDWAF_SHARED_LINKER_FLAGS "-static-libstdc++" CACHE STRING "Shared library extra linker flags")
@@ -34,7 +34,7 @@
  
  option(LIBDDWAF_BUILD_SHARED "Build shared library" ON)
  option(LIBDDWAF_BUILD_STATIC "Build shared library" ON)
-@@ -59,7 +59,7 @@ endif()
+@@ -57,7 +57,7 @@ endif()
  
  include(GNUInstallDirs)
  
@@ -43,7 +43,7 @@
  
  set(LIBDDWAF_SOURCE
      ${libddwaf_SOURCE_DIR}/src/ruleset_builder.cpp
-@@ -123,7 +123,8 @@ install(FILES ${libddwaf_SOURCE_DIR}/include/ddwaf.h D
+@@ -137,7 +137,8 @@ install(FILES ${libddwaf_SOURCE_DIR}/include/ddwaf.h D
  
  # System dependencies
  set(LIBDDWAF_INTERFACE_LIBRARIES "")
@@ -53,7 +53,7 @@
  
  if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
  # needed for glibc <2.17. We compile with --as-needed so the library won't
-@@ -151,6 +152,27 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+@@ -165,6 +166,27 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
  elseif(WIN32)
      list(APPEND LIBDDWAF_INTERFACE_LIBRARIES ws2_32)
  endif()
@@ -81,7 +81,7 @@
  
  target_link_libraries(libddwaf_objects
      PRIVATE ${LIBDDWAF_PRIVATE_LIBRARIES}
-@@ -175,66 +197,67 @@ if (LIBDDWAF_BUILD_STATIC)
+@@ -189,66 +211,67 @@ if (LIBDDWAF_BUILD_STATIC)
          INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
  
      # Post-processing on the static library