diff --git a/x11/xfce4-screensaver/Makefile b/x11/xfce4-screensaver/Makefile
index 8e27d6d24054..9c314a60894c 100644
--- a/x11/xfce4-screensaver/Makefile
+++ b/x11/xfce4-screensaver/Makefile
@@ -1,68 +1,67 @@
 PORTNAME=	xfce4-screensaver
-PORTVERSION=	4.18.2
-PORTREVISION=	3
+PORTVERSION=	4.18.3
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce 4 screen saver and locker
 WWW=		https://git.xfce.org/apps/xfce4-screensaver/about/
 
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL20=	${WRKSRC}/COPYING.LIB
 
 BUILD_DEPENDS=	xdt-csource:devel/xfce4-dev-tools
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
-		libxklavier.so:x11/libxklavier \
-		libharfbuzz.so:print/harfbuzz
+		libharfbuzz.so:print/harfbuzz \
+		libxklavier.so:x11/libxklavier
 
 USES=		compiler:c11 gettext-tools gl gmake gnome pkgconfig python \
 		shebangfix tar:bzip2 xfce xorg
 USE_GL=		gl
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 intltool libwnck3
 USE_XFCE=	garcon xfconf
 USE_XORG=	ice sm x11 xext xrandr xscrnsaver xxf86vm
 
-SHEBANG_FILES=	src/xfce4-screensaver-configure
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-CONFIGURE_ARGS=	--with-console-kit=yes \
-		--with-systemd=no \
-		--enable-maintainer-mode
+SHEBANG_FILES=			src/xfce4-screensaver-configure
+GNU_CONFIGURE=			yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+CONFIGURE_ARGS=			--enable-maintainer-mode \
+				--with-console-kit=yes \
+				--with-systemd=no
 
 SCREENSAVER_DIR=	share/applications/screensavers
 
-OPTIONS_DEFINE=	NLS PAM
-OPTIONS_DEFAULT=PAM
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		NLS PAM
+OPTIONS_DEFAULT=	PAM
+OPTIONS_SUB=		yes
 
+NLS_USES=		gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=	gettext-runtime
 
 PAM_RUN_DEPENDS=	pam_helper:security/pam_helper
 PAM_CONFIGURE_ON=	--enable-authentication-scheme=helper \
 			--with-passwd-helper=${LOCALBASE}/bin/pam_helper
 PAM_CONFIGURE_OFF=	--disable-pam
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug=yes
 .endif
 
 post-patch-PAM-on:
 	@${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \
 		${WRKSRC}/src/gs-auth-pam.c
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SCREENSAVER_DIR}
 	@${REINPLACE_CMD} 's/^\(Name[^=]*=\)\(.*\)/\1XFCE \2/' ${STAGEDIR}${PREFIX}/etc/xdg/autostart/xfce4-screensaver.desktop
 
 post-install-PAM-on:
 	${INSTALL_DATA} ${FILESDIR}/xfce4-screensaver.pam ${STAGEDIR}${PREFIX}/etc/pam.d/xfce4-screensaver.sample
 
 .include <bsd.port.post.mk>
diff --git a/x11/xfce4-screensaver/distinfo b/x11/xfce4-screensaver/distinfo
index 444284c31908..18bcaea27552 100644
--- a/x11/xfce4-screensaver/distinfo
+++ b/x11/xfce4-screensaver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1685439485
-SHA256 (xfce4/xfce4-screensaver-4.18.2.tar.bz2) = e4fcd2c414d3a4215e9e86a55edd87e2545b15c961917f5d72cace35b76e2b98
-SIZE (xfce4/xfce4-screensaver-4.18.2.tar.bz2) = 714671
+TIMESTAMP = 1709560690
+SHA256 (xfce4/xfce4-screensaver-4.18.3.tar.bz2) = d171316136a1189dfe69ef3da7f7a7f842014129ece184cc21ffb13bc0e13a39
+SIZE (xfce4/xfce4-screensaver-4.18.3.tar.bz2) = 722788