diff --git a/graphics/xwpick/Makefile b/graphics/xwpick/Makefile
index 9373a9d757f8..3a1f4398a7c5 100644
--- a/graphics/xwpick/Makefile
+++ b/graphics/xwpick/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	xwpick
 PORTVERSION=	2.20
 PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	XCONTRIB/applications
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Image pick up utility for X Window System
 
 LICENSE=	xwpick
 LICENSE_NAME=	xwpick license  # non-commercial
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 USES=		imake xorg
 USE_XORG=	x11 xext
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${SED} -ne '/COPYRIGHT NOTICE/,$$ p' ${WRKSRC}/0README >${WRKSRC}/COPYING
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CNL_ARTICLE.PS ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/0README ${STAGEDIR}${DOCSDIR}/README
 
 .include <bsd.port.mk>
diff --git a/graphics/xwpick/files/patch-ImgToolKit.c b/graphics/xwpick/files/patch-ImgToolKit.c
new file mode 100644
index 000000000000..4c5a0c311f11
--- /dev/null
+++ b/graphics/xwpick/files/patch-ImgToolKit.c
@@ -0,0 +1,11 @@
+--- ImgToolKit.c.orig	1994-11-02 00:30:07.000000000 -0800
++++ ImgToolKit.c	2023-05-25 07:50:21.577290000 -0700
+@@ -269,7 +269,7 @@
+   curW  = win;
+   state = XInternAtom(theDsp, "WM_STATE", True);
+   if (state != NULL) {
+-    type = NULL;
++    type = 0;
+     kidW = win;
+     while (kidW != NULL) {
+       curW = kidW;