diff --git a/devel/sdl2pp/Makefile b/devel/sdl2pp/Makefile
index 637dfda34ee2..6eb448a2f317 100644
--- a/devel/sdl2pp/Makefile
+++ b/devel/sdl2pp/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	sdl2pp
-PORTVERSION=	0.16.2
+PORTVERSION=	0.17.0
 CATEGORIES=	devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	C++11 bindings/wrapper for SDL2
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libSDL2pp
 GH_PROJECT=	libSDL2pp
 
-USES=		cmake compiler:c++11-lib sdl
+USES=		cmake compiler:c++17-lang sdl
 CMAKE_ARGS=	-DSDL2PP_ENABLE_LIVE_TESTS=OFF
 USE_SDL=	sdl2 image2 mixer2 ttf2
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS DOXYGEN
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_ALL_TARGET=	all doxygen
 DOXYGEN_IMPLIES=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
 
 post-install-DOXYGEN-on:
 	@cd ${CONFIGURE_WRKSRC} && ${COPYTREE_SHARE} doxygen ${STAGEDIR}${DOCSDIR}/
 
 do-test:
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${LOCALBASE}/bin/ctest -V
 
 .include <bsd.port.mk>
diff --git a/devel/sdl2pp/distinfo b/devel/sdl2pp/distinfo
index 335af337e10f..80e3547c8ea1 100644
--- a/devel/sdl2pp/distinfo
+++ b/devel/sdl2pp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651072364
-SHA256 (libSDL2pp-libSDL2pp-0.16.2_GH0.tar.gz) = 67c85f4cad59e5eb15451cabc79dcbae560147182a0c60cec69eb16b84634633
-SIZE (libSDL2pp-libSDL2pp-0.16.2_GH0.tar.gz) = 306323
+TIMESTAMP = 1651171671
+SHA256 (libSDL2pp-libSDL2pp-0.17.0_GH0.tar.gz) = 52a1f8c14ebadf3b7be3ce96473f0007b85a551a4d18805472eb8737287d1f6e
+SIZE (libSDL2pp-libSDL2pp-0.17.0_GH0.tar.gz) = 301140
diff --git a/devel/sdl2pp/pkg-plist b/devel/sdl2pp/pkg-plist
index 9b8def42d06e..3e2a46256655 100644
--- a/devel/sdl2pp/pkg-plist
+++ b/devel/sdl2pp/pkg-plist
@@ -1,32 +1,36 @@
 include/SDL2pp/AudioDevice.hh
 include/SDL2pp/AudioSpec.hh
 include/SDL2pp/Chunk.hh
 include/SDL2pp/Color.hh
 include/SDL2pp/Config.hh
 include/SDL2pp/ContainerRWops.hh
 include/SDL2pp/Exception.hh
 include/SDL2pp/Export.hh
 include/SDL2pp/Font.hh
 include/SDL2pp/Mixer.hh
 include/SDL2pp/Music.hh
 include/SDL2pp/Optional.hh
 include/SDL2pp/Point.hh
 include/SDL2pp/RWops.hh
 include/SDL2pp/Rect.hh
 include/SDL2pp/Renderer.hh
 include/SDL2pp/SDL.hh
 include/SDL2pp/SDL2pp.hh
 include/SDL2pp/SDLImage.hh
 include/SDL2pp/SDLMixer.hh
 include/SDL2pp/SDLTTF.hh
 include/SDL2pp/StreamRWops.hh
 include/SDL2pp/Surface.hh
 include/SDL2pp/Texture.hh
 include/SDL2pp/Wav.hh
 include/SDL2pp/Window.hh
-include/SDL2pp/external/libcpp_optional.hh
 lib/libSDL2pp.so
 lib/libSDL2pp.so.8
 lib/libSDL2pp.so.8.3.0
 libdata/pkgconfig/sdl2pp.pc
-share/cmake/Modules/FindSDL2PP.cmake
+lib/cmake/SDL2pp/FindSDL2_image.cmake
+lib/cmake/SDL2pp/FindSDL2_mixer.cmake
+lib/cmake/SDL2pp/FindSDL2_ttf.cmake
+lib/cmake/SDL2pp/SDL2ppConfig.cmake
+lib/cmake/SDL2pp/SDL2ppTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/SDL2pp/SDL2ppTargets.cmake