diff --git a/www/fgallery/Makefile b/www/fgallery/Makefile
index e4c462781019..eef5145f794c 100644
--- a/www/fgallery/Makefile
+++ b/www/fgallery/Makefile
@@ -1,50 +1,55 @@
 PORTNAME=	fgallery
 PORTVERSION=	1.9.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www graphics
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Modern, static javascript photo gallery generator
 WWW=		https://www.thregr.org/~wavexx/software/fgallery/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 RUN_DEPENDS=	exiftool:graphics/p5-Image-ExifTool \
 		exiftran:graphics/exiftran \
 		p5-Cpanel-JSON-XS>=0:converters/p5-Cpanel-JSON-XS
 
-USES=		magick:6,run
+USES=		magick:7,run
 USE_GITHUB=	yes
 GH_ACCOUNT=	wavexx
 GH_TAGNAME=	45a8629
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-OPTIONS_DEFINE=		7ZIP FACEDETECT JPEGOPTIM
-OPTIONS_DEFAULT=	7ZIP FACEDETECT JPEGOPTIM
+OPTIONS_DEFINE=		7ZIP FACEDETECT JPEGOPTIM OXIPNG
+OPTIONS_DEFAULT=	7ZIP FACEDETECT JPEGOPTIM OXIPNG
 
 7ZIP_DESC=		Use 7-Zip for better zip compression
 FACEDETECT_DESC=	Face detection for improved thumbnail centering
 JPEGOPTIM_DESC=		Use jpegoptim for JPEG size optimization
+OXIPNG_DESC=		Use oxipng for PNG size optimization
 
 7ZIP_RUN_DEPENDS=	7zz:archivers/7-zip
 7ZIP_RUN_DEPENDS_OFF=	zip:archivers/zip
 FACEDETECT_RUN_DEPENDS=	facedetect:graphics/facedetect
 JPEGOPTIM_RUN_DEPENDS=	jpegoptim:graphics/jpegoptim
+OXIPNG_RUN_DEPENDS=	oxipng:graphics/oxipng
 
 post-patch-7ZIP-on:
 	@${REINPLACE_CMD} -e 's|7za|7zz|g' ${WRKSRC}/${PORTNAME}
 
+post-patch-OXIPNG-on:
+	@${REINPLACE_CMD} -e 's|pngcrush|oxipng|g' ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.1
+
 do-install:
 .for d in album view
 	(cd ${WRKSRC} && \
 	${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR}
 	${LN} -s ${DATADIR}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/fgallery/files/patch-fgallery b/www/fgallery/files/patch-fgallery
new file mode 100644
index 000000000000..a621910e33ce
--- /dev/null
+++ b/www/fgallery/files/patch-fgallery
@@ -0,0 +1,11 @@
+--- fgallery.orig	2024-03-17 13:48:32 UTC
++++ fgallery
+@@ -649,7 +649,7 @@ sub process_img
+     sys('jpegoptim', '-q', $fout);
+   } elsif($pngoptim && $props{FileType} eq "PNG")
+   {
+-    sys('pngcrush', '-q', $fout, $ftmp);
++    sys('pngcrush', '-q --out', $ftmp, $fout);
+     rename($ftmp, $fout);
+   }
+