diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index ab8817fe6616..9fe0056073a5 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.99 2022/11/23 16:21:29 adam Exp $
+# $NetBSD: Makefile,v 1.100 2023/01/01 19:19:26 gutteridge Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-DISTNAME=		xfce4-session-4.16.0
-PKGREVISION=		6
+DISTNAME=		xfce4-session-4.18.0
 CATEGORIES=		x11
-MASTER_SITES+=		https://archive.xfce.org/src/xfce/xfce4-session/4.16/
+MASTER_SITES+=		https://archive.xfce.org/src/xfce/xfce4-session/${PKGVERSION_NOREV:R}/
 
 HOMEPAGE=		https://docs.xfce.org/xfce/xfce4-session/start
 COMMENT=		Xfce session manager
diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST
index c4d779332f56..ff4e9d33c4de 100644
--- a/x11/xfce4-session/PLIST
+++ b/x11/xfce4-session/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2021/11/30 14:31:09 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.27 2023/01/01 19:19:26 gutteridge Exp $
 bin/startxfce4
 bin/xfce4-session
 bin/xfce4-session-logout
@@ -36,6 +36,7 @@ share/icons/hicolor/scalable/apps/org.xfce.session.svg
 share/locale/am/LC_MESSAGES/xfce4-session.mo
 share/locale/ar/LC_MESSAGES/xfce4-session.mo
 share/locale/ast/LC_MESSAGES/xfce4-session.mo
+share/locale/az/LC_MESSAGES/xfce4-session.mo
 share/locale/be/LC_MESSAGES/xfce4-session.mo
 share/locale/be@tarask/LC_MESSAGES/xfce4-session.mo
 share/locale/bg/LC_MESSAGES/xfce4-session.mo
@@ -52,6 +53,7 @@ share/locale/eo/LC_MESSAGES/xfce4-session.mo
 share/locale/es/LC_MESSAGES/xfce4-session.mo
 share/locale/et/LC_MESSAGES/xfce4-session.mo
 share/locale/eu/LC_MESSAGES/xfce4-session.mo
+share/locale/fa_IR/LC_MESSAGES/xfce4-session.mo
 share/locale/fi/LC_MESSAGES/xfce4-session.mo
 share/locale/fr/LC_MESSAGES/xfce4-session.mo
 share/locale/gl/LC_MESSAGES/xfce4-session.mo
diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo
index d7c324e00112..a5b9df35d3d1 100644
--- a/x11/xfce4-session/distinfo
+++ b/x11/xfce4-session/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.35 2022/02/06 17:42:47 gutteridge Exp $
+$NetBSD: distinfo,v 1.36 2023/01/01 19:19:26 gutteridge Exp $
 
-BLAKE2s (xfce4-session-4.16.0.tar.bz2) = c47d2336881178cc04dccf92d345e58e39118644636993ab5228833601cf8119
-SHA512 (xfce4-session-4.16.0.tar.bz2) = fd74b24d0c2762b5a99883b62ca9447c3683e42e9e39193d0f60e02b8c1ad77a3dfff4df6f3b3c345d8ea3d4c4ef93485e9b5586862bab85d4b37110d3400fad
-Size (xfce4-session-4.16.0.tar.bz2) = 875504 bytes
+BLAKE2s (xfce4-session-4.18.0.tar.bz2) = 00e8f3dbb17f27be47ea1c12b475daab34d49505368084390aeb1417fd997441
+SHA512 (xfce4-session-4.18.0.tar.bz2) = 00fcae02004675a26e6d73998403cf0e3a36dfd3596315ee98567d302a10c344cc1b64dac782e02416f11f6db3c730792e8de7d2d0ea1a6e0f2b2b7dbee74f4c
+Size (xfce4-session-4.18.0.tar.bz2) = 853627 bytes
 SHA1 (patch-ac) = acbb27c79b5b6f37ff106c6cbbc87d00ecfe19f5
 SHA1 (patch-config.h.in) = 30e2ae1ea70a99a83f11523e940081b661add69b
-SHA1 (patch-configure) = 155a85a71b42fb360d97c4fda87d54a16f567c87
+SHA1 (patch-configure) = e0e117ea68ed48508b944be3f0f5b3cb0a0713d9
 SHA1 (patch-libxfsm_xfsm-shutdown-common.h) = 4712465218a6bc9beb740203e820203d08b06c06
 SHA1 (patch-scripts_Makefile.in) = 042c3d9c632a57f9acfc8dab43aa6bca8ec69097
 SHA1 (patch-settings_xfce4-session.xml) = 7e990e73d8dab022f3ebd2d4daa24ebc8dcf95a1
diff --git a/x11/xfce4-session/patches/patch-configure b/x11/xfce4-session/patches/patch-configure
index 89028624908e..dff6a65ecbf4 100644
--- a/x11/xfce4-session/patches/patch-configure
+++ b/x11/xfce4-session/patches/patch-configure
@@ -1,12 +1,14 @@
-$NetBSD: patch-configure,v 1.7 2021/11/30 14:31:09 gutteridge Exp $
+$NetBSD: patch-configure,v 1.8 2023/01/01 19:19:26 gutteridge Exp $
 
-Add NetBSD backend detection. Allow Polkit to be disabled in the build
-while still being present in the underlying system.
+* Add NetBSD backend detection.
 
---- configure.orig	2020-12-22 23:09:11.000000000 +0000
+* Allow Polkit to be disabled in the build while still being present in the
+underlying system.
+
+--- configure.orig	2022-12-15 09:27:27.000000000 +0000
 +++ configure
-@@ -17536,7 +17536,7 @@ $as_echo_n "checking for optional packag
- $as_echo "disabled" >&6; }
+@@ -18012,7 +18012,7 @@ printf %s "checking for optional package
+ printf "%s\n" "disabled" >&6; }
    fi
  
 -   if test x"$POLKIT_FOUND" = x"yes"; then
@@ -14,7 +16,7 @@ while still being present in the underlying system.
    HAVE_POLKIT_TRUE=
    HAVE_POLKIT_FALSE='#'
  else
-@@ -17798,6 +17798,8 @@ if test x$with_backend = x; then
+@@ -18307,6 +18307,8 @@ if test x$with_backend = x; then
      with_backend=freebsd ;; #(
    *-*dragonfly*) :
      with_backend=freebsd ;; #(
@@ -23,13 +25,13 @@ while still being present in the underlying system.
    *-openbsd*) :
      with_backend=openbsd ;; #(
    *) :
-@@ -17827,6 +17829,11 @@ if test x$with_backend = xopenbsd; then
- $as_echo "#define BACKEND_TYPE_OPENBSD 1" >>confdefs.h
+@@ -18334,6 +18336,11 @@ if test x$with_backend = xopenbsd; then
+ printf "%s\n" "#define BACKEND_TYPE_OPENBSD 1" >>confdefs.h
  
  fi
 +if test x$with_backend = xnetbsd; then
 +
-+$as_echo "#define BACKEND_TYPE_NETBSD 1" >>confdefs.h
++printf "%s\n" "#define BACKEND_TYPE_NETBSD 1" >>confdefs.h
 +
 +fi