diff --git a/baselibs.conf b/baselibs.conf
index 4e056067..d8badad8 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -2,9 +2,10 @@
 # https://en.opensuse.org/openSUSE:Build_Service_baselibs.conf#Quickstart
 #
 systemd
-  supplements "packageand(systemd:pam-<targettype>)"
+  supplements "(systemd and pam-<targettype>)"
   -/lib/systemd/system/
-  -/usr/lib/systemd/libsystemd-shared.*\.so
+  -/usr/lib/systemd
+  -/usr/lib/cryptsetup
   post "<prefix>%{_sbindir}/pam-config -a --systemd || :"
 libsystemd0
 libudev1
diff --git a/systemd.changes b/systemd.changes
index e6179a8f..afdb38b5 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Mar 12 12:57:26 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Update Supplements to new format in baselibs.conf
+- Fix libsystemd-shared exclusion in baselibs.conf
+- Exclude new cryptsetup libraries in baselibs.conf
+
 -------------------------------------------------------------------
 Tue Mar  8 19:08:03 UTC 2022 - Franck Bui <fbui@suse.com>