diff --git a/devel/cpprestsdk/Makefile b/devel/cpprestsdk/Makefile
index f6e6ca45d48d..a28cdac6f76d 100644
--- a/devel/cpprestsdk/Makefile
+++ b/devel/cpprestsdk/Makefile
@@ -1,33 +1,30 @@
 PORTNAME=	cpprestsdk
-PORTVERSION=	2.10.16
-PORTREVISION=	1
+PORTVERSION=	2.10.18
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
-MAINTAINER=	projects@phess.net
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Microsoft C++ REST SDK
 WWW=		https://github.com/Microsoft/cpprestsdk
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../license.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/websocketpp/client.hpp:devel/websocketpp
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
-BROKEN=		error: performing pointer subtraction with a null pointer may have undefined behavior
-
 USES=		cmake compiler:c++11-lang pkgconfig ssl
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	Microsoft
 WRKSRC_SUBDIR=	Release
 CMAKE_OFF=	BUILD_SAMPLES BUILD_TESTS
 
 CXXFLAGS+=	-Wno-c11-extensions
 
 OPTIONS_DEFINE=	BROTLI
 
 BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
 BROTLI_CMAKE_ON=	-DCPPREST_EXCLUDE_BROTLI:BOOL=OFF
 
 .include <bsd.port.mk>
diff --git a/devel/cpprestsdk/distinfo b/devel/cpprestsdk/distinfo
index ae2db5db25b9..05d6bf4a9623 100644
--- a/devel/cpprestsdk/distinfo
+++ b/devel/cpprestsdk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587775456
-SHA256 (Microsoft-cpprestsdk-v2.10.16_GH0.tar.gz) = 3d75e17c7d79131320438f2a15331f7ca6281c38c0e2daa27f051e290eeb8681
-SIZE (Microsoft-cpprestsdk-v2.10.16_GH0.tar.gz) = 1768423
+TIMESTAMP = 1665067608
+SHA256 (Microsoft-cpprestsdk-v2.10.18_GH0.tar.gz) = 6bd74a637ff182144b6a4271227ea8b6b3ea92389f88b25b215e6f94fd4d41cb
+SIZE (Microsoft-cpprestsdk-v2.10.18_GH0.tar.gz) = 1747792
diff --git a/devel/cpprestsdk/files/patch-src_CMakeLists.txt b/devel/cpprestsdk/files/patch-src_CMakeLists.txt
new file mode 100644
index 000000000000..b99d076519df
--- /dev/null
+++ b/devel/cpprestsdk/files/patch-src_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- src/CMakeLists.txt.orig	2022-10-06 15:08:19 UTC
++++ src/CMakeLists.txt
+@@ -187,7 +187,7 @@ configure_pch(cpprest stdafx.h pch/stdafx.cpp /Zm120)
+ 
+ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+   if(WERROR)
+-    target_compile_options(cpprest PRIVATE -Werror)
++    target_compile_options(cpprest PRIVATE -Wno-error)
+   endif()
+   target_compile_options(cpprest PRIVATE -pedantic ${WARNINGS})
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")