diff --git a/games/DDNet/Makefile b/games/DDNet/Makefile
index 4875667c5378..1ab65fbc7333 100644
--- a/games/DDNet/Makefile
+++ b/games/DDNet/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	DDNet
-PORTVERSION=	16.1
+PORTVERSION=	16.2.1
 CATEGORIES=	games
 MASTER_SITES=	https://ddnet.tw/downloads/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	DDraceNetwork, a cooperative racing mod of Teeworlds
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 LIB_DEPENDS=	libpnglite.so:graphics/pnglite
 
 USES=		cmake compiler:c++17-lang pkgconfig python sqlite:3 ssl tar:xz
 CMAKE_ARGS=	-DPYTHON_EXECUTABLE="${PYTHON_CMD}"
 CMAKE_OFF=	AUTOUPDATE DOWNLOAD_GTEST PREFER_BUNDLED_LIBS
 
 CXXFLAGS+=	-DBINARY_DIR="\\\"${PREFIX}/bin\\\""
 
 PORTDATA=	*
 DATADIR=	${PREFIX}/share/ddnet
 
 TEST_ENV=	${MAKE_ENV} GTEST_FILTER=-Io.CurrentExe:Jobs.LookupHost
 
 OPTIONS_DEFINE=		TEST WEBSOCKETS MYSQL VIDEORECORDER UPNP VULKAN
 OPTIONS_MULTI=		COMPONENTS
 OPTIONS_MULTI_COMPONENTS=CLIENT SERVER
 OPTIONS_DEFAULT=	CLIENT SERVER TEST VIDEORECORDER UPNP VULKAN
 OPTIONS_SUB=		yes
 
 CLIENT_DESC=		Build game client
 CLIENT_CMAKE_BOOL=	CLIENT
 CLIENT_USES=		gettext gl sdl xorg desktop-file-utils
 CLIENT_USE=		GL=gl,glew SDL=sdl2
 CLIENT_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libwavpack.so:audio/wavpack \
 			libopusfile.so:audio/opusfile \
 			libopus.so:audio/opus \
 			libogg.so:audio/libogg \
 			libnotify.so:devel/libnotify \
 			libcurl.so:ftp/curl
 
 SERVER_DESC=		Build game server
 SERVER_CMAKE_BOOL=	SERVER
 # does not build without these libs, but does not need them in
 # runtime either
 SERVER_BUILD_DEPENDS=	glew>=0:graphics/glew \
 			wavpack>=0:audio/wavpack
 
 TEST_BUILD_DEPENDS=	googletest>=0:devel/googletest
 TEST_TEST_TARGET=	run_tests
 
 WEBSOCKETS_DESC=	Enable WebSocket support for server
 WEBSOCKETS_CMAKE_BOOL=	WEBSOCKETS
 WEBSOCKETS_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
 
 MYSQL_DESC=		Enable MySQL/MariaDB support for server
 MYSQL_CMAKE_BOOL=	MYSQL
 MYSQL_USES=		mysql
 MYSQL_LIB_DEPENDS=	libmysqlcppconn.so:databases/mysql-connector-c++
 
 VIDEORECORDER_DESC=	Video recording support using FFmpeg to the client
 VIDEORECORDER_CMAKE_BOOL=VIDEORECORDER
 VIDEORECORDER_LIB_DEPENDS=libavcodec.so:multimedia/ffmpeg
 
 UPNP_DESC=		UPnP support for the server
 UPNP_CMAKE_BOOL=	UPNP
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_IMPLIES=		SERVER
 
 VULKAN_DESC=		Enable the vulkan backend
 VULKAN_CMAKE_BOOL=	VULKAN
 VULKAN_IMPLIES=		CLIENT
 VULKAN_BUILD_DEPENDS=	glslangValidator:graphics/glslang \
 			${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 
 post-extract:
 # json-parser and md5 are left intact
 .for dep in glew pnglite wavpack zlib
 	@${RM} -r ${WRKSRC}/src/engine/external/${dep}
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} -e '/find_package.*Git/ d' ${WRKSRC}/CMakeLists.txt
 
 post-patch-TEST-off:
 	@${REINPLACE_CMD} -e '/find_package.*GTest/ d' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/games/DDNet/distinfo b/games/DDNet/distinfo
index 79e52af21b95..f0d419e24198 100644
--- a/games/DDNet/distinfo
+++ b/games/DDNet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653595015
-SHA256 (DDNet-16.1.tar.xz) = 22b8911d1416d4e988f0a9ac53d8e7c106c6738d6c782e63a50e9452ef8a340a
-SIZE (DDNet-16.1.tar.xz) = 28541296
+TIMESTAMP = 1657724658
+SHA256 (DDNet-16.2.1.tar.xz) = e966b3ffd23109f35d5fdb9c92170ea11bc2bf9ddaf9581b4f6136801c9919a2
+SIZE (DDNet-16.2.1.tar.xz) = 28659312
diff --git a/games/DDNet/files/patch-src_engine_server_databases_mysql.cpp b/games/DDNet/files/patch-src_engine_server_databases_mysql.cpp
new file mode 100644
index 000000000000..a79723bca988
--- /dev/null
+++ b/games/DDNet/files/patch-src_engine_server_databases_mysql.cpp
@@ -0,0 +1,10 @@
+--- src/engine/server/databases/mysql.cpp.orig	2022-07-05 08:29:46 UTC
++++ src/engine/server/databases/mysql.cpp
+@@ -11,7 +11,6 @@
+ #include <vector>
+ 
+ #ifndef LIBMARIADB
+-typedef bool my_bool;
+ #endif
+ 
+ enum
diff --git a/games/DDNet/pkg-plist b/games/DDNet/pkg-plist
index 5be0080002ca..f2dc41f653a5 100644
--- a/games/DDNet/pkg-plist
+++ b/games/DDNet/pkg-plist
@@ -1,27 +1,27 @@
 %%CLIENT%%bin/DDNet
 %%SERVER%%bin/DDNet-Server
 lib/ddnet/config_retrieve
 lib/ddnet/config_store
 lib/ddnet/crapnet
 lib/ddnet/dilate
 lib/ddnet/dummy_map
-lib/ddnet/fake_server
 lib/ddnet/map_convert_07
 lib/ddnet/map_diff
 lib/ddnet/map_extract
 lib/ddnet/map_optimize
 lib/ddnet/map_replace_image
 lib/ddnet/map_resave
 lib/ddnet/packetgen
+lib/ddnet/stun
 lib/ddnet/unicode_confusables
 lib/ddnet/uuid
 %%CLIENT%%share/applications/ddnet.desktop
 %%CLIENT%%share/icons/hicolor/16x16/apps/ddnet.png
 %%SERVER%%share/icons/hicolor/16x16/apps/ddnet-server.png
 %%CLIENT%%share/icons/hicolor/256x256/apps/ddnet.png
 %%SERVER%%share/icons/hicolor/256x256/apps/ddnet-server.png
 %%CLIENT%%share/icons/hicolor/32x32/apps/ddnet.png
 %%SERVER%%share/icons/hicolor/32x32/apps/ddnet-server.png
 %%CLIENT%%share/icons/hicolor/48x48/apps/ddnet.png
 %%SERVER%%share/icons/hicolor/48x48/apps/ddnet-server.png
 %%CLIENT%%share/metainfo/ddnet.appdata.xml