diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index 52b5b9ce2baa..4f6aced3f5ae 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -1,63 +1,64 @@
 PORTNAME=	xfce4-settings
 PORTVERSION=	4.20.0
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce settings management
 WWW=		https://gitlab.xfce.org/xfce/xfce4-settings
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	hwdata>0:misc/hwdata
 LIB_DEPENDS=	libcolord.so:graphics/colord \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libxklavier.so:x11/libxklavier
 RUN_DEPENDS=	hwdata>0:misc/hwdata
 
 USES=		compiler:c11 desktop-file-utils gettext-tools gmake gnome \
 		libtool pkgconfig python shebangfix tar:bzip2 xfce xorg
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 libxml2:build
 USE_XFCE=	garcon libexo xfconf
 USE_XORG=	x11 xcursor xi xorgproto xrandr
 
 SHEBANG_FILES=	dialogs/mime-settings/helpers/xfce4-compose-mail
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-x11 \
 		--with-pnp-ids-path=${LOCALBASE}/share/hwdata/pnp.ids
 INSTALL_TARGET=	install-strip
 
 PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=		LIBINPUT NLS NOTIFY UPOWER WAYLAND
 OPTIONS_DEFAULT=	LIBINPUT NOTIFY UPOWER WAYLAND
 OPTIONS_SUB=		yes
 
 LIBINPUT_DESC=	Libinput support
 UPOWER_DESC=	Power management tasks
 
 LIBINPUT_BUILD_DEPENDS=		xf86-input-libinput>0:x11-drivers/xf86-input-libinput
 LIBINPUT_CONFIGURE_ENABLE=	xorg-libinput
 
 NLS_USES=		gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 
 NOTIFY_LIB_DEPENDS=		libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=	libnotify
 
 UPOWER_LIB_DEPENDS=		libupower-glib.so:sysutils/upower
 UPOWER_CONFIGURE_ENABLE=	upower-glib
 
 WAYLAND_LIB_DEPENDS=		libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell \
 				libwayland-client.so:graphics/wayland
 WAYLAND_CONFIGURE_ENABLE=	gtk-layer-shell wayland
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|Rodent|elementary-xfce|g' \
 		${WRKSRC}/dialogs/appearance-settings/main.c
 	@${REINPLACE_CMD} -e 's|IconThemeName" type="string" value="Adwaita|IconThemeName" type="string" value="elementary-xfce|' \
 		${WRKSRC}/xfsettingsd/xsettings.xml
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-settings/files/patch-xfsettingsd_Makefile.in b/sysutils/xfce4-settings/files/patch-xfsettingsd_Makefile.in
new file mode 100644
index 000000000000..bc29365d1d88
--- /dev/null
+++ b/sysutils/xfce4-settings/files/patch-xfsettingsd_Makefile.in
@@ -0,0 +1,28 @@
+--- xfsettingsd/Makefile.in.orig	2024-12-15 09:30:17 UTC
++++ xfsettingsd/Makefile.in
+@@ -1406,25 +1406,6 @@ uninstall-am: uninstall-autostartDATA uninstall-binPRO
+ %.desktop: %.desktop.in
+ 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ 
+-# Needed for XfceGtkSettingsHelper to translate GtkSettings property names into
+-# Xfconf property names
+-xsettings-properties.h: $(settings_DATA)
+-	$(AM_V_GEN) \
+-	printf '%s\n' \
+-		'#if G_GNUC_CHECK_VERSION (4, 6)' \
+-		'# pragma GCC diagnostic push' \
+-		'# pragma GCC diagnostic ignored "-Wunused-variable"' \
+-		'#endif' > $@; \
+-	for _prefix in $(shell $(XMLLINT) --xpath '//channel/property/@name' $< | $(SED) -E 's/name="(.*)"/\1/'); do \
+-		echo "static const gchar *xsettings_properties_$${_prefix}[] = {" \
+-		&& $(XMLLINT) --xpath "//channel/property[@name=\"$${_prefix}\"]/property/@name" $< | $(SED) -E 's/name=(.*)/\1,/' \
+-		&& echo '};'; \
+-	done >> $@; \
+-	printf '%s\n' \
+-		'#if G_GNUC_CHECK_VERSION (4, 6)' \
+-		'# pragma GCC diagnostic pop' \
+-		'#endif' >> $@;
+-
+ # Export on D-Bus by XfceGtkSettingsHelper of the module name xfsettingsd-gtk-settings-sync
+ # for synchronization of GtkSettings properties with the Xfconf xsettings channel on Wayland
+ gtk-settings-exported.c:
diff --git a/sysutils/xfce4-settings/files/patch-xfsettingsd_gtk-settings.c b/sysutils/xfce4-settings/files/patch-xfsettingsd_gtk-settings.c
deleted file mode 100644
index f95c843db542..000000000000
--- a/sysutils/xfce4-settings/files/patch-xfsettingsd_gtk-settings.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- xfsettingsd/gtk-settings.c.orig	2024-12-01 15:21:41 UTC
-+++ xfsettingsd/gtk-settings.c
-@@ -226,8 +226,8 @@ xfce_gtk_settings_helper_init (XfceGtkSettingsHelper *
-     }
- 
-     net_properties = g_hash_table_new (g_str_hash, g_str_equal);
--    for (guint i = 0; i < G_N_ELEMENTS (xsettings_properties_Net); i++)
--        g_hash_table_add (net_properties, (gpointer) xsettings_properties_Net[i]);
-+    /*for (guint i = 0; i < G_N_ELEMENTS (xsettings_properties_Net); i++)
-+        g_hash_table_add (net_properties, (gpointer) xsettings_properties_Net[i]);*/
- 
-     helper->gsettings_objs = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
-     helper->gsettings_data = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);