diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 371f6cfdddfe..fc0a959e7ac3 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	xfce4-session
 PORTVERSION=	4.20.2
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce's session manager
 WWW=		https://gitlab.xfce.org/xfce/xfce4-session
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	iceauth:x11/iceauth
 RUN_DEPENDS=	iceauth:x11/iceauth \
 		console-kit-daemon:sysutils/consolekit2 \
 		xrdb:x11/xrdb
 LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit
 
 USES=		compiler:c11 gettext-tools gmake gnome libtool pathfix \
 		pkgconfig tar:bzip2 xfce xorg
 USE_GNOME=	cairo gdkpixbuf gtk30 glib20 libwnck3
 USE_XFCE=	libmenu xfconf windowing
 USE_XORG=	ice sm x11
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-legacy-sm \
 		--with-backend=freebsd \
 		--enable-x11 \
 		--enable-polkit \
 		--with-xsession-prefix=${PREFIX} \
 		--with-wayland-session-prefix=${PREFIX}
 SUB_FILES=	pkg-message
 INSTALL_TARGET=	install-strip
 
 PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=		NLS WAYLAND
 OPTIONS_DEFAULT=	WAYLAND
 OPTIONS_SUB=		yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
 
 WAYLAND_LIB_DEPENDS=		libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell \
 				libwayland-client.so:graphics/wayland
 WAYLAND_CONFIGURE_ENABLE=	gtk-layer-shell wayland
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-session/files/patch-scripts_xflock4 b/x11-wm/xfce4-session/files/patch-scripts_xflock4
new file mode 100644
index 000000000000..44b8684a3d8a
--- /dev/null
+++ b/x11-wm/xfce4-session/files/patch-scripts_xflock4
@@ -0,0 +1,17 @@
+--- scripts/xflock4.orig	2025-03-21 09:25:42 UTC
++++ scripts/xflock4
+@@ -47,12 +47,12 @@ esac
+ [ -t 0 ] && sleep 1
+ 
+ # echo is used to strip blanks
+-# $((2**31 - 1)) is MAXINT, which disables timeout: see
++# $(((1<<31)-1)) is MAXINT, which disables timeout: see
+ # https://dbus.freedesktop.org/doc/api/html/group__DBusPendingCall.html
+ ret=$(echo $(dbus-send --session \
+                        --dest=org.xfce.SessionManager \
+                        --print-reply=literal \
+-                       --reply-timeout=$((2**31 - 1)) \
++                       --reply-timeout=$(((1<<31)-1)) \
+                        --type=method_call \
+                        /org/xfce/SessionManager \
+                        org.xfce.Session.Manager.Lock))