diff --git a/x11-wm/fvwm3/Makefile b/x11-wm/fvwm3/Makefile
index a6d01d7d4592..b2a4d67fa8a4 100644
--- a/x11-wm/fvwm3/Makefile
+++ b/x11-wm/fvwm3/Makefile
@@ -1,95 +1,95 @@
 # Created by: Felix Palmen <felix@palmen-it.de>
 
 PORTNAME=	fvwm3
 PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://github.com/fvwmorg/fvwm3/releases/download/${PORTVERSION}/ \
 		http://fvwm.sourceforge.net/generated/icon_download/:icons
 
 MAINTAINER=	felix@palmen-it.de
 COMMENT=	F? Virtual Window Manager
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libevent.so:devel/libevent \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		compiler:c11 cpe pkgconfig python:3.7+ readline xorg
 USE_XORG=	ice sm x11 xext xft xrandr xrender xt
 
 CONFLICTS_INSTALL=	fvwm
 
 CPE_VENDOR=	fvwm
 CPE_PRODUCT=	fvwm
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	ac_cv_path_PYTHON=${PYTHON_CMD}
 
 OPTIONS_DEFINE=	FRIBIDI GO ICONS ICONV MANPAGES NLS PERL PNG SVG \
 		XCURSOR XPM
 OPTIONS_DEFAULT=	FRIBIDI GO ICONV MANPAGES PERL PNG XCURSOR
 OPTIONS_SUB=	yes
 
 FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_ENABLE=	bidi
 
 GO_DESC=	Build and install modules written in Go
 GO_USES=	go:no_targets
 GO_CONFIGURE_ENABLE=	golang
 GO_MAKE_ARGS=	GOBUILD="go build -ldflags=\"-s -w\""
 
 FVWM_ICONS=	fvwm_icons-20070101
 ICONS_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${FVWM_ICONS}.tar.bz2:icons
 ICONS_IMPLIES=	XPM
 
 ICONV_USES=	iconv:translit
 ICONV_CONFIGURE_ENABLE=	iconv
 
 MANPAGES_BUILD_DEPENDS=	rubygem-asciidoctor>0:textproc/rubygem-asciidoctor
 MANPAGES_USES=	gmake
 MANPAGES_CONFIGURE_ENABLE=	mandoc
 MANPAGES_IMPLIES=	PERL
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext-runtime
 
 PERL_USES=	perl5
 PERL_CONFIGURE_ENABLE=	perllib
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_ENABLE=	png
 
 SVG_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2-rust
 SVG_USES=	gnome
 SVG_USE=	gnome=cairo,glib20,gdkpixbuf2
 SVG_CONFIGURE_ENABLE=	rsvg
 
 XCURSOR_USE=	xorg=xcursor
 XCURSOR_CONFIGURE_ENABLE=	xcursor
 
 XPM_USE=	xorg=xpm
 XPM_CONFIGURE_OFF=	--with-xpm-library=no
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc/,${LOCALBASE}/etc/,g' \
 		${WRKSRC}/bin/fvwm-menu-desktop.in
 
 post-install-ICONS-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/fvwm3/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/${FVWM_ICONS}/*.xpm \
 		${STAGEDIR}${PREFIX}/share/fvwm3/pixmaps
 
 post-install-PERL-off:
 .for script in fvwm-convert-2.6 fvwm-menu-directory fvwm-menu-xlock fvwm-perllib
 	${RM} ${STAGEDIR}${PREFIX}/bin/${script}
 .endfor
 .for script in FvwmConsoleC.pl FvwmPerl
 	${RM} ${STAGEDIR}${PREFIX}/libexec/fvwm3/${PORTVERSION}/${script}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm3/files/patch-modules_FvwmIconMan_x.c b/x11-wm/fvwm3/files/patch-modules_FvwmIconMan_x.c
new file mode 100644
index 000000000000..a525fb032feb
--- /dev/null
+++ b/x11-wm/fvwm3/files/patch-modules_FvwmIconMan_x.c
@@ -0,0 +1,10 @@
+--- modules/FvwmIconMan/x.c.orig	2022-07-18 23:18:50 UTC
++++ modules/FvwmIconMan/x.c
+@@ -742,6 +742,7 @@ void X_init_manager (int man_id)
+     char *scr;
+     fscreen_scr_arg arg;
+     arg.mouse_ev = NULL;
++    arg.name = NULL;
+ 
+     geometry_mask = FScreenParseGeometryWithScreen(
+       man->geometry_str, &man->geometry.x, &man->geometry.y,