diff --git a/xdg-current-desktop-xfce.desktop b/xdg-current-desktop-xfce.desktop
new file mode 100644
index 0000000..9c36a16
--- /dev/null
+++ b/xdg-current-desktop-xfce.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.9.4
+Type=Application
+Name=xdg-current-desktop-xfce
+Comment=
+Exec=sh -c "dbus-update-activation-environment --systemd XDG_CURRENT_DESKTOP=$XDG_CURRENT_DESKTOP && systemctl --user restart xdg-desktop-portal"
+OnlyShowIn=XFCE;
+RunHook=0
+StartupNotify=false
+Terminal=false
+Hidden=false
+
diff --git a/xfce-portals.conf b/xfce-portals.conf
new file mode 100644
index 0000000..85efaa5
--- /dev/null
+++ b/xfce-portals.conf
@@ -0,0 +1,2 @@
+[preferred]
+default=gtk;
\ No newline at end of file
diff --git a/xfce4-session.changes b/xfce4-session.changes
index 1984e67..54790aa 100644
--- a/xfce4-session.changes
+++ b/xfce4-session.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Oct 26 07:11:11 UTC 2023 - Maurizio Galli <maurizio.galli@suse.com>
+
+- Added xfce-portals.conf file. XDP 0.18.0 requires desktop and other 
+  environments to have their own portals.conf drop in file and this
+  is a workaround until a better fix lands (boo#1215641)
+  
+- Added xdg-current-desktop-xfce.desktop to autostart to ensure variable
+  XDG_CURRENT_DESKTOP variable is properly exposed to systemd (boo#1215641)
+  
+- Relax requirement of branding package version to prevent
+  xfce4-branding-openSUSE breaking on Leap due to repos being out of sync 
+  (boo#1216470)
+
 -------------------------------------------------------------------
 Mon May 29 17:28:12 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
 
diff --git a/xfce4-session.spec b/xfce4-session.spec
index 63129fa..2c5dc67 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -25,6 +25,8 @@ License:        GPL-2.0-only
 Group:          System/GUI/XFCE
 URL:            https://docs.xfce.org/xfce/xfce4-session/start
 Source0:        https://archive.xfce.org/src/xfce/xfce4-session/4.18/%{name}-%{version}.tar.bz2
+Source1:        xfce-portals.conf
+Source2:        xdg-current-desktop-xfce.desktop
 %if %{with git}
 # PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts-git.patch bnc#789057 maurizio.galli@gmail.com-- Adapt upstream sessions script to openSUSE.
 Patch0:         xfce4-session-adapt-session-scripts-git.patch
@@ -54,7 +56,7 @@ BuildRequires:  pkgconfig(libxfconf-0) >= 4.12.0
 BuildRequires:  pkgconfig(polkit-gobject-1) >= 0.102
 BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(x11)
-Requires:       %{name}-branding = %{version}
+Requires:       %{name}-branding
 Requires:       systemd
 Requires:       xfce4-settings
 Requires:       xfconf
@@ -73,6 +75,8 @@ Recommends:     xfdesktop
 Recommends:     libxfce4ui-tools
 Obsoletes:      libxfsm-4_6-0 < %{version}
 Obsoletes:      xfce4-session-devel < %{version}
+# For flatpaks to work properly (boo#1215641)
+Recommends:     xdg-desktop-portal-gtk
 
 %description
 xfce4-session is the session manager for the Xfce desktop environment.
@@ -108,6 +112,13 @@ NOCONFIGURE=1 ./autogen.sh
 %make_build
 
 %install
+
+# Install xfce-portals.conf (boo#1215641)
+install -Dpm 0644 -t %{buildroot}%{_datadir}/xdg-desktop-portal/ %{SOURCE1}
+
+# Ensure XDG_CURRENT_DESKTOP environment variable is exposed when Xfce starts (boo#1215641)
+install -Dpm 0644 -t %{buildroot}%{_sysconfdir}/xdg/autostart %{SOURCE2}
+
 %make_install
 
 %fdupes -s %{buildroot}%{_datadir}/icons/hicolor/*
@@ -147,6 +158,7 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/xscreensaver.desktop
 %doc AUTHORS BUGS NEWS README.md TODO
 %config %{_sysconfdir}/xdg/xfce4/Xft.xrdb
 %{_sysconfdir}/xdg/xfce4/xinitrc
+%config %{_sysconfdir}/xdg/autostart/xdg-current-desktop-xfce.desktop
 %{_bindir}/xfce4-session
 %{_bindir}/xfce4-session-logout
 %{_bindir}/xfce4-session-settings
@@ -159,6 +171,8 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/xscreensaver.desktop
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/*/*/*
 %doc %{_mandir}/man1/xfce4-session*.1*
+%dir %{_datadir}/xdg-desktop-portal
+%{_datadir}/xdg-desktop-portal/xfce-portals.conf
 
 %files lang -f %{name}.lang