diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index adf3fcdb59be..acbe6053199d 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -1,41 +1,37 @@
 PORTNAME=	optipng
-PORTVERSION=	0.7.7
+DISTVERSION=	0.7.7
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/OptiPNG/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	tom@hur.st
 COMMENT=	Optimizer for PNG files
-WWW=		http://optipng.sourceforge.net/
+WWW=		https://optipng.sourceforge.net/
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-OPTIONS_DEFINE=	BUNDLED_LIBPNG BUNDLED_ZLIB DOCS
+LIB_DEPENDS=	libpng.so:graphics/png
 
-BUNDLED_LIBPNG_DESC=		Use bundled libpng
-BUNDLED_LIBPNG_CONFIGURE_OFF=	--with-system-libpng
-BUNDLED_LIBPNG_CONFIGURE_ON=	--without-system-libpng
-BUNDLED_LIBPNG_LIB_DEPENDS_OFF=	libpng.so:graphics/png
-BUNDLED_LIBPNG_USES_OFF=	localbase:ldflags
-
-BUNDLED_ZLIB_DESC=		Use bundled zlib
-BUNDLED_ZLIB_CONFIGURE_OFF=	--with-system-zlib
-BUNDLED_ZLIB_CONFIGURE_ON=	--without-system-zlib
+USES=		cpe gmake localbase:ldflags
+CPE_VENDOR=	optipng_project
 
-USES=		cpe gmake
 HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-system-libpng \
+		--with-system-zlib
 
-CPE_VENDOR=	optipng_project
-
-PLIST_FILES=	bin/optipng man/man1/optipng.1.gz
+PLIST_FILES=	bin/optipng \
+		man/man1/optipng.1.gz
 PORTDOCS=	history.txt optipng.man.html optipng.man.pdf optipng.man.txt \
 		png_optimization.html todo.txt
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/optipng/optipng ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/src/optipng/man/optipng.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/graphics/optipng/files/patch-src_gifread_gifread.c b/graphics/optipng/files/patch-src_gifread_gifread.c
new file mode 100644
index 000000000000..bfc0112026c5
--- /dev/null
+++ b/graphics/optipng/files/patch-src_gifread_gifread.c
@@ -0,0 +1,14 @@
+--- src/gifread/gifread.c.orig	2017-12-10 23:49:00 UTC
++++ src/gifread/gifread.c
+@@ -363,6 +363,11 @@ static int LZWGetCode(int code_size, int init_flag, FI
+         lastbit = (2 + count) * 8;
+     }
+ 
++    if (code_size && (size_t)(curbit + code_size - 1) / 8 >= sizeof(buffer)) {
++        GIFError("Malformed GIF (CVE-2023-43907)");
++        return -1;
++    }
++
+     ret = 0;
+     for (i = curbit, j = 0; j < code_size; ++i, ++j)
+         ret |= ((buffer[i / 8] & (1 << (i % 8))) != 0) << j;