diff --git a/config.sh b/config.sh
index 71e405c..0130dc7 100644
--- a/config.sh
+++ b/config.sh
@@ -47,7 +47,8 @@ if rpm -q libQt6WebEngineCore6; then
 	rpm -e --nodeps libQt6WebEngineCore6
 fi
 
-/usr/lib/rpm/fdupes_wrapper /usr/share/licenses
+# Reuse what the macro does
+rpm --eval "%fdupes /usr/share/licenses" | sh
 
 #--------------------------------------
 # enable and disable services
@@ -116,8 +117,8 @@ EULA_DIR=/etc/YaST2/licenses/base
 (cd "${EULA_DIR}"; tar -cvzf /license.tar.gz *)
 
 # Remove some large locales to save space
-rm -rf /usr/{lib,share}/locale/{ca,cs,da,ja,fi,hu,id,ko,nl,pl,tr,ru,sk,sr,sv,uk,vi,cmn_TW,zh}*
-rm -rf /usr/share/qt5/translations/*_{ca,cs,da,ja,fi,hu,id,ko,nl,pl,tr,ru,sk,sr,sv,uk,vi,cmn_TW,zh}*
+rm -rf /usr/{lib,share}/locale/{ca,cs,da,es,it,ja,fi,hu,id,ko,nl,pl,pt_BR,tr,ro,ru,sk,sr,sv,uk,vi,cmn_TW,zh}*
+rm -rf /usr/share/qt5/translations/*_{ca,cs,da,es,it,ja,fi,hu,id,ko,nl,pl,pr_BR,tr,ro,ru,sk,sr,sv,uk,vi,cmn_TW,zh}*
 zypper --non-interactive rm yast2-trans-{uk,sv,ru,ja,da,cs,sr,vi} || :
 
 # Some packages really exaggerate here
diff --git a/list-common.sh b/list-common.sh
index e6a536a..e9aab8c 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -118,6 +118,7 @@ buildignore usbmuxd
 # http://bugzilla.opensuse.org/show_bug.cgi?id=1209177
 buildignore gnome-keyring-pam
 buildignore pam_kwallet
+buildignore pam_kwallet6
 
 buildignore apparmor-docs
 buildignore mutt-doc
@@ -236,7 +237,6 @@ install dmraid
 install dosfstools
 install e2fsprogs
 install exfatprogs
-install jfsutils
 install mdadm
 install multipath-tools
 install ntfs-3g
diff --git a/list-x11.sh b/list-x11.sh
index 2247c6c..7ed86be 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -1,5 +1,6 @@
 buildignore NetworkManager-lang
 buildignore NetworkManager-applet-lang
+buildignore NetworkManager-pptp
 buildignore PackageKit
 buildignore samba-libs
 buildignore release-notes-openSUSE
@@ -148,7 +149,6 @@ install hexchat
 install leafpad
 install lightdm
 install lightdm-gtk-greeter
-install photorec
 install thunar
 install thunar-volman
 install xfce4-appfinder
@@ -166,7 +166,6 @@ install dbus-1-x11
 install desktop-file-utils
 install libgnomesu
 install libxfce4ui-tools
-install pinentry-gtk2
 install shared-mime-info
 install xdg-user-dirs-gtk
 install xdg-utils
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 00a2f10..1dd646c 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->
@@ -359,7 +361,6 @@
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
     <package name="exfatprogs"/>
-    <package name="jfsutils"/>
     <package name="mdadm"/>
     <package name="multipath-tools"/>
     <package name="ntfs-3g"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 24d38a2..425f874 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->
@@ -359,7 +361,6 @@
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
     <package name="exfatprogs"/>
-    <package name="jfsutils"/>
     <package name="mdadm"/>
     <package name="multipath-tools"/>
     <package name="ntfs-3g"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 79ca182..bd3d581 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->
@@ -359,7 +361,6 @@
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
     <package name="exfatprogs"/>
-    <package name="jfsutils"/>
     <package name="mdadm"/>
     <package name="multipath-tools"/>
     <package name="ntfs-3g"/>
@@ -425,6 +426,8 @@
     <ignore name="NetworkManager-lang"/>
     <!-- OBS-IgnorePackage: NetworkManager-applet-lang -->
     <ignore name="NetworkManager-applet-lang"/>
+    <!-- OBS-IgnorePackage: NetworkManager-pptp -->
+    <ignore name="NetworkManager-pptp"/>
     <!-- OBS-IgnorePackage: PackageKit -->
     <ignore name="PackageKit"/>
     <!-- OBS-IgnorePackage: samba-libs -->
@@ -535,14 +538,48 @@
     <ignore name="xfce4-settings-lang"/>
     <!-- OBS-IgnorePackage: xfce4-panel-lang -->
     <ignore name="xfce4-panel-lang"/>
-    <!-- OBS-IgnorePackage: xfce-terminal-lang -->
-    <ignore name="xfce-terminal-lang"/>
+    <!-- OBS-IgnorePackage: xfce4-terminal-lang -->
+    <ignore name="xfce4-terminal-lang"/>
+    <!-- OBS-IgnorePackage: xfce4-session-lang -->
+    <ignore name="xfce4-session-lang"/>
+    <!-- OBS-IgnorePackage: catfish-lang -->
+    <ignore name="catfish-lang"/>
+    <!-- OBS-IgnorePackage: libxfce4ui-lang -->
+    <ignore name="libxfce4ui-lang"/>
+    <!-- OBS-IgnorePackage: libxfce4util-lang -->
+    <ignore name="libxfce4util-lang"/>
+    <!-- OBS-IgnorePackage: xfwm4-lang -->
+    <ignore name="xfwm4-lang"/>
+    <!-- OBS-IgnorePackage: xfce4-whiskermenu-plugin-lang -->
+    <ignore name="xfce4-whiskermenu-plugin-lang"/>
+    <!-- OBS-IgnorePackage: xfce4-appfinder-lang -->
+    <ignore name="xfce4-appfinder-lang"/>
+    <!-- OBS-IgnorePackage: xfce4-notifyd-lang -->
+    <ignore name="xfce4-notifyd-lang"/>
+    <!-- OBS-IgnorePackage: thunar-volman-lang -->
+    <ignore name="thunar-volman-lang"/>
+    <!-- OBS-IgnorePackage: xfconf-lang -->
+    <ignore name="xfconf-lang"/>
+    <!-- OBS-IgnorePackage: xfce4-pulseaudio-plugin-lang -->
+    <ignore name="xfce4-pulseaudio-plugin-lang"/>
+    <!-- OBS-IgnorePackage: xfce4-xkb-plugin-lang -->
+    <ignore name="xfce4-xkb-plugin-lang"/>
+    <!-- OBS-IgnorePackage: libgarcon-lang -->
+    <ignore name="libgarcon-lang"/>
+    <!-- OBS-IgnorePackage: lightdm-lang -->
+    <ignore name="lightdm-lang"/>
+    <!-- OBS-IgnorePackage: lightdm-gtk-greeter-lang -->
+    <ignore name="lightdm-gtk-greeter-lang"/>
+    <!-- OBS-IgnorePackage: mlocate-lang -->
+    <ignore name="mlocate-lang"/>
     <!-- OBS-IgnorePackage: exo-lang -->
     <ignore name="exo-lang"/>
     <!-- OBS-IgnorePackage: xfdesktop-lang -->
     <ignore name="xfdesktop-lang"/>
     <!-- OBS-IgnorePackage: xfce4-power-manager-lang -->
     <ignore name="xfce4-power-manager-lang"/>
+    <!-- OBS-IgnorePackage: info-lang -->
+    <ignore name="info-lang"/>
     <!-- OBS-IgnorePackage: noto-sans-cjk-fonts -->
     <ignore name="noto-sans-cjk-fonts"/>
     <!-- OBS-IgnorePackage: man-pages-posix -->
@@ -559,6 +596,28 @@
     <ignore name="plymouth"/>
     <!-- OBS-IgnorePackage: 7zip -->
     <ignore name="7zip"/>
+    <!-- OBS-IgnorePackage: bash-completion -->
+    <ignore name="bash-completion"/>
+    <!-- OBS-IgnorePackage: ethtool-bash-completion -->
+    <ignore name="ethtool-bash-completion"/>
+    <!-- OBS-IgnorePackage: iproute2-bash-completion -->
+    <ignore name="iproute2-bash-completion"/>
+    <!-- OBS-IgnorePackage: cpupower-bash-completion -->
+    <ignore name="cpupower-bash-completion"/>
+    <!-- OBS-IgnorePackage: nvme-cli-bash-completion -->
+    <ignore name="nvme-cli-bash-completion"/>
+    <!-- OBS-IgnorePackage: btrfsprogs-bash-completion -->
+    <ignore name="btrfsprogs-bash-completion"/>
+    <!-- OBS-IgnorePackage: firewalld-bash-completion -->
+    <ignore name="firewalld-bash-completion"/>
+    <!-- OBS-IgnorePackage: kmod-bash-completion -->
+    <ignore name="kmod-bash-completion"/>
+    <!-- OBS-IgnorePackage: pulseaudio-bash-completion -->
+    <ignore name="pulseaudio-bash-completion"/>
+    <!-- OBS-IgnorePackage: udisks2-bash-completion -->
+    <ignore name="udisks2-bash-completion"/>
+    <!-- OBS-IgnorePackage: lightdm-bash-completion -->
+    <ignore name="lightdm-bash-completion"/>
     <!-- OBS-IgnorePackage: tumbler -->
     <ignore name="tumbler"/>
     <!-- OBS-IgnorePackage: ristretto -->
@@ -585,7 +644,6 @@
     <package name="leafpad"/>
     <package name="lightdm"/>
     <package name="lightdm-gtk-greeter"/>
-    <package name="photorec"/>
     <package name="thunar"/>
     <package name="thunar-volman"/>
     <package name="xfce4-appfinder"/>
@@ -601,7 +659,6 @@
     <package name="desktop-file-utils"/>
     <package name="libgnomesu"/>
     <package name="libxfce4ui-tools"/>
-    <package name="pinentry-gtk2"/>
     <package name="shared-mime-info"/>
     <package name="xdg-user-dirs-gtk"/>
     <package name="xdg-utils"/>
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index 55b7f7e..d122579 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->
@@ -359,7 +361,6 @@
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
     <package name="exfatprogs"/>
-    <package name="jfsutils"/>
     <package name="mdadm"/>
     <package name="multipath-tools"/>
     <package name="ntfs-3g"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index e7e9dfe..54e6a08 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Mon May 13 09:24:27 UTC 2024 - Fabian Vogt <fvogt@suse.com>
+
+- Ignore pam_kwallet6 (boo#1224153)
+
+-------------------------------------------------------------------
+Wed May  8 14:14:09 UTC 2024 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Drop jfsutils from all lives: this is not one of our supported
+  file systems. USers of installed systems are free to use the
+  tools.
+
+-------------------------------------------------------------------
+Wed May  8 12:34:59 UTC 2024 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Block NetworkManager-pptp from the x11 live: to recover the
+  machine, pptp is unlikely to be needed.
+
 -------------------------------------------------------------------
 Tue Apr 23 11:14:27 UTC 2024 - Ana Guerrero <ana.guerrero@suse.com>
 
@@ -24,6 +42,11 @@ Mon Apr 22 12:41:09 UTC 2024 - Ana Guerrero <ana.guerrero@suse.com>
 - Fix tumbleweed live image, try to decrease size following the new
   branding packages. Remove a few lang packages from xfce.
 
+-------------------------------------------------------------------
+Mon Mar 25 14:48:59 UTC 2024 - Fabian Vogt <fvogt@suse.com>
+
+- Use %fdupes in config.sh to fix build on Leap
+
 -------------------------------------------------------------------
 Tue Mar 19 16:18:33 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index eb76159..ced24b6 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->
@@ -359,7 +361,6 @@
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
     <package name="exfatprogs"/>
-    <package name="jfsutils"/>
     <package name="mdadm"/>
     <package name="multipath-tools"/>
     <package name="ntfs-3g"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 457f4eb..c7d6a89 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->
@@ -359,7 +361,6 @@
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
     <package name="exfatprogs"/>
-    <package name="jfsutils"/>
     <package name="mdadm"/>
     <package name="multipath-tools"/>
     <package name="ntfs-3g"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index e7c2e83..192a5cc 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->
@@ -359,7 +361,6 @@
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
     <package name="exfatprogs"/>
-    <package name="jfsutils"/>
     <package name="mdadm"/>
     <package name="multipath-tools"/>
     <package name="ntfs-3g"/>
@@ -425,6 +426,8 @@
     <ignore name="NetworkManager-lang"/>
     <!-- OBS-IgnorePackage: NetworkManager-applet-lang -->
     <ignore name="NetworkManager-applet-lang"/>
+    <!-- OBS-IgnorePackage: NetworkManager-pptp -->
+    <ignore name="NetworkManager-pptp"/>
     <!-- OBS-IgnorePackage: PackageKit -->
     <ignore name="PackageKit"/>
     <!-- OBS-IgnorePackage: samba-libs -->
@@ -643,7 +646,6 @@
     <package name="leafpad"/>
     <package name="lightdm"/>
     <package name="lightdm-gtk-greeter"/>
-    <package name="photorec"/>
     <package name="thunar"/>
     <package name="thunar-volman"/>
     <package name="xfce4-appfinder"/>
@@ -659,7 +661,6 @@
     <package name="desktop-file-utils"/>
     <package name="libgnomesu"/>
     <package name="libxfce4ui-tools"/>
-    <package name="pinentry-gtk2"/>
     <package name="shared-mime-info"/>
     <package name="xdg-user-dirs-gtk"/>
     <package name="xdg-utils"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 7f16eed..e11338b 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -239,6 +239,8 @@
     <ignore name="gnome-keyring-pam"/>
     <!-- OBS-IgnorePackage: pam_kwallet -->
     <ignore name="pam_kwallet"/>
+    <!-- OBS-IgnorePackage: pam_kwallet6 -->
+    <ignore name="pam_kwallet6"/>
     <!-- OBS-IgnorePackage: apparmor-docs -->
     <ignore name="apparmor-docs"/>
     <!-- OBS-IgnorePackage: mutt-doc -->
@@ -359,7 +361,6 @@
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
     <package name="exfatprogs"/>
-    <package name="jfsutils"/>
     <package name="mdadm"/>
     <package name="multipath-tools"/>
     <package name="ntfs-3g"/>