diff --git a/graphics/agg26/Makefile b/graphics/agg26/Makefile
index 0db825fbe6d7..9beca02d1f2a 100644
--- a/graphics/agg26/Makefile
+++ b/graphics/agg26/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	agg
-PORTVERSION=	2.6
+DISTVERSION=	2.6
 PORTREVISION=	0
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	26${PKGNAMESUFFIX2}
@@ -20,10 +20,10 @@ CPE_VENDOR=	antigrain
 USE_GITHUB=	yes
 GH_ACCOUNT=	ghaerr
 GH_PROJECT=	${PORTNAME}-${PORTVERSION}
-GH_TAGNAME=	c4f36b44
+GH_TAGNAME=	c4f36b44 # 20230821
 USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
-USE_SDL=	sdl
+USE_SDL=	sdl2
 USE_XORG=	x11
 
 GNU_CONFIGURE=	yes
@@ -32,6 +32,9 @@ WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}/agg-src
 INSTALL_TARGET=	install-strip
 
 post-patch:
-	@${REINPLACE_CMD} 's/_LDFLAGS/_LDADD/' ${WRKSRC}/examples/Makefile.am
+	${REINPLACE_CMD} \
+		's|agg_platform_support.cpp|../sdl2/agg_platform_support.cpp|' \
+		 ${WRKSRC}/src/platform/sdl/Makefile.am
+	${REINPLACE_CMD} 's|_LDFLAGS|_LDADD|' ${WRKSRC}/examples/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/graphics/agg26/files/patch-configure.ac b/graphics/agg26/files/patch-configure.ac
new file mode 100644
index 000000000000..26f1ae438df4
--- /dev/null
+++ b/graphics/agg26/files/patch-configure.ac
@@ -0,0 +1,15 @@
+--- configure.ac.orig	2023-08-21 15:51:12 UTC
++++ configure.ac
+@@ -99,9 +99,9 @@ temp_CXXFLAGS="$CXXFLAGS"
+ temp_LIBS="$LIBS"
+ temp_CFLAGS="$CFLAGS"
+ temp_CXXFLAGS="$CXXFLAGS"
+-sdl_enabled=""
+-SDL_VERSION=1.2.0
+-AM_PATH_SDL($SDL_VERSION,
++sdl_enabled="yes"
++SDL_VERSION=2.1.0
++AM_PATH_SDL2($SDL_VERSION,
+     [sdl_enabled="yes"],
+     AC_MSG_WARN([*** SDL version $SDL_VERSION not found! Omitting sdl layer.])
+     )