diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index ed210db17115..490d54e0d2ab 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	xfce4-panel
-PORTVERSION=	4.18.5
-PORTREVISION=	2
+PORTVERSION=	4.18.6
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce's panel
 WWW=		https://docs.xfce.org/xfce/xfce4-panel/start
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
 
 LIB_DEPENDS=	libdbusmenu-gtk3.so:devel/libdbusmenu \
 		libharfbuzz.so:print/harfbuzz
 
 USES=		compiler:c11 desktop-file-utils gettext-tools gmake gnome \
 		libtool pathfix perl5 pkgconfig tar:bzip2 xfce xorg
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 intltool libwnck3
 USE_LDCONFIG=	yes
 USE_XFCE=	garcon libexo xfconf
 USE_XORG=	ice sm x11 xext
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-gio-unix \
+		--without-html-dir
 INSTALL_TARGET=	install-strip
-CONFIGURE_ARGS=	--enable-gio-unix --without-html-dir
 
 PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=		GIR NLS VAPI
 OPTIONS_DEFAULT=	GIR VAPI
 OPTIONS_SUB=		yes
 
 GIR_DESC=		Use Gobject Introspection
 
-GIR_USE=		gnome=introspection:build
+GIR_USE=		GNOME=introspection:build
 GIR_CONFIGURE_ON=	--enable-introspection=yes
 GIR_CONFIGURE_OFF=	--enable-introspection=no
 
-NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
 
+VAPI_IMPLIES=		GIR
 VAPI_USES=		vala:build
 VAPI_CONFIGURE_ENABLE=	vala
-VAPI_IMPLIES=		GIR
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index 1ae2cb27cfa5..38a31b8101e1 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695835964
-SHA256 (xfce4/xfce4-panel-4.18.5.tar.bz2) = b20e0d10cc5149a601d8eee07373efb446ea3e179dd032ed8ddb5782e3f9e7cb
-SIZE (xfce4/xfce4-panel-4.18.5.tar.bz2) = 1591758
+TIMESTAMP = 1709218506
+SHA256 (xfce4/xfce4-panel-4.18.6.tar.bz2) = 21337161f58bb9b6e42760cb6883bc79beea27882aa6272b61f0e09d750d7c62
+SIZE (xfce4/xfce4-panel-4.18.6.tar.bz2) = 1595352