diff --git a/x11-wm/fvwm3/Makefile b/x11-wm/fvwm3/Makefile
index 7f426ee89eac..c070e8450f59 100644
--- a/x11-wm/fvwm3/Makefile
+++ b/x11-wm/fvwm3/Makefile
@@ -1,91 +1,90 @@
 PORTNAME=	fvwm3
-PORTVERSION=	1.0.6a
-PORTREVISION=	2
+DISTVERSION=	1.0.7
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://github.com/fvwmorg/fvwm3/releases/download/${DISTVERSION}/ \
 		http://fvwm.sourceforge.net/generated/icon_download/:icons
 
 MAINTAINER=	zirias@FreeBSD.org
 COMMENT=	F? Virtual Window Manager
 WWW=		https://www.fvwm.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libevent.so:devel/libevent \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
-USES=		autoreconf compiler:c11 cpe pkgconfig python readline xorg
+USES=		compiler:c11 cpe pkgconfig python readline xorg
 CPE_VENDOR=	fvwm
 CPE_PRODUCT=	fvwm
 USE_XORG=	ice sm x11 xext xft xrandr xrender xt
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	ac_cv_path_PYTHON=${PYTHON_CMD}
 
 CONFLICTS_INSTALL=	fvwm
 PLIST_SUB=		DISTVERSION=${DISTVERSION}
 
 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
 GO_DESC=		Build and install modules written in Go
 
 FRIBIDI_LIB_DEPENDS=		libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_ENABLE=	bidi
 
 GO_USES=		go:no_targets
 GO_CONFIGURE_ENABLE=	golang
 
 FVWM_ICONS=		fvwm_icons-20070101
 ICONS_IMPLIES=		XPM
 ICONS_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${FVWM_ICONS}.tar.bz2:icons
 
 ICONV_USES=		iconv:translit
 ICONV_CONFIGURE_ENABLE=	iconv
 
 MANPAGES_IMPLIES=	PERL
 MANPAGES_BUILD_DEPENDS=	rubygem-asciidoctor>0:textproc/rubygem-asciidoctor
 MANPAGES_USES=		gmake
 MANPAGES_CONFIGURE_ENABLE=	mandoc
 
 NLS_USES=		gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 
 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/${DISTVERSION}/${script}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm3/distinfo b/x11-wm/fvwm3/distinfo
index 8d7d9fec7bfe..52ac18570852 100644
--- a/x11-wm/fvwm3/distinfo
+++ b/x11-wm/fvwm3/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1676896741
-SHA256 (fvwm3-1.0.6a.tar.gz) = 4665a66133e070b791917b0794cc6df6b754679ebe9130718427db6479bb5b68
-SIZE (fvwm3-1.0.6a.tar.gz) = 4538100
+TIMESTAMP = 1689061517
+SHA256 (fvwm3-1.0.7.tar.gz) = 3aacd7cfeff60db1bcd9c77332dc575fe7711d2d306f0479525378dc6db3d31e
+SIZE (fvwm3-1.0.7.tar.gz) = 4512128
 SHA256 (fvwm_icons-20070101.tar.bz2) = 86b0164430a3087f5cb8d55eb43a8676bbce495814b30c6844eb127f952642ab
 SIZE (fvwm_icons-20070101.tar.bz2) = 330862
diff --git a/x11-wm/fvwm3/files/patch-configure.ac b/x11-wm/fvwm3/files/patch-configure.ac
deleted file mode 100644
index 3c86c28ba618..000000000000
--- a/x11-wm/fvwm3/files/patch-configure.ac
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.ac.orig	2023-01-16 19:48:02 UTC
-+++ configure.ac
-@@ -86,7 +86,7 @@ if test ! x"$with_golang" = xno; then
- 		sed -e 's/ .*$//')
- 	    AC_MSG_CHECKING([whether go version is >= 1.14.x ($go_version)])
- 	    case "$go_version" in
--	     1.14*|1.15*|1.16*|1.17*|1.18*|1.19*)
-+	     1.14*|1.15*|1.16*|1.17*|1.18*|1.19*|1.2*)
- 	      AC_MSG_RESULT([yes - version is: $go_version])
- 	      with_golang="yes"
- 	      GO=
-@@ -224,17 +224,6 @@ AC_MINIX
- # Help finding POSIX functions on some systems
- AC_ISC_POSIX
- AC_MINIX
--
--# catch -Werror and similar options when running configure
--AC_TRY_COMPILE([#include <stdio.h>],
--[int i; static j; int *p; char *c;
--  switch (*p = p = *c) { case 0: printf("%Q", c, p); }
--  *c = &i; c = p;
--  while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1));
--], , AC_MSG_ERROR("
--configure is not able to compile programs with warnings.  Please
--remove all offending options like -Werror from the CFLAGS and
--CPPFLAGS variables and run configure again."))
- 
- # check size of some types
- ac_save_CFLAGS="$CFLAGS"