diff --git a/x11/controllermap/Makefile b/x11/controllermap/Makefile
index 9e657adf9740..4d81d404c28f 100644
--- a/x11/controllermap/Makefile
+++ b/x11/controllermap/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	controllermap
-PORTVERSION=	2.0.22
+DISTVERSION=	2.24.2
 CATEGORIES=	x11
 MASTER_SITES=	https://www.libsdl.org/release/
 DISTNAME=	SDL2-${DISTVERSION}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Game controller mapping generator
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		sdl
 USE_SDL=	sdl2
 WRKSRC_SUBDIR=	test
 CFLAGS+=	`sdl2-config --cflags`
 LIBS+=		`sdl2-config --libs`
 MAKEFILE=	/dev/null
 MAKE_ENV=	LDLIBS="${LIBS}"
 ALL_TARGET=	${PORTNAME} testgamecontroller testjoystick
 PLIST_FILES=	${ALL_TARGET:S,^,bin/,}
 PORTDATA=	${PORTNAME}.bmp ${PORTNAME}_back.bmp axis.bmp button.bmp
 
 post-patch:
-	@${REINPLACE_CMD} '/bmp/s,","${DATADIR}/,' \
+	@${REINPLACE_CMD} -e '/bmp/s,","${DATADIR}/,' \
+		-e '/#include/s/\(testutils\)\.h/\1.c/' \
 		${ALL_TARGET:S,^,${WRKSRC}/,:S,$,.c,}
 
 do-install:
 	${INSTALL_PROGRAM} ${ALL_TARGET:S,^,${WRKSRC}/,} \
 		${STAGEDIR}${PREFIX}/bin
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" \
 		${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/x11/controllermap/distinfo b/x11/controllermap/distinfo
index 12d5029b3b08..ec013cf2be3d 100644
--- a/x11/controllermap/distinfo
+++ b/x11/controllermap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1650971027
-SHA256 (SDL2-2.0.22.tar.gz) = fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e
-SIZE (SDL2-2.0.22.tar.gz) = 7250633
+TIMESTAMP = 1627397549
+SHA256 (SDL2-2.24.2.tar.gz) = b35ef0a802b09d90ed3add0dcac0e95820804202914f5bb7b0feb710f1a1329f
+SIZE (SDL2-2.24.2.tar.gz) = 7525041