diff --git a/files.systemd b/files.systemd
index a245c56f..a149243f 100644
--- a/files.systemd
+++ b/files.systemd
@@ -330,7 +330,6 @@
 %{_mandir}/man8/halt.8.gz
 %{_mandir}/man8/pam_systemd.8.gz
 %{_mandir}/man8/poweroff.8.gz
-%{_mandir}/man8/rc-local.service.8.gz
 %{_mandir}/man8/reboot.8.gz
 %{_mandir}/man8/shutdown.8.gz
 %{_mandir}/man8/systemd-ask-password-console.path.8.gz
diff --git a/files.sysvcompat b/files.sysvcompat
index 49e50a81..786a9b3c 100644
--- a/files.sysvcompat
+++ b/files.sysvcompat
@@ -6,6 +6,7 @@
 %dir %{_unitdir}/runlevel3.target.wants
 %dir %{_unitdir}/runlevel4.target.wants
 %dir %{_unitdir}/runlevel5.target.wants
+%{_mandir}/man8/rc-local.service.8.gz
 %{_mandir}/man8/runlevel.8.gz
 %{_mandir}/man8/systemd-initctl.8.gz
 %{_mandir}/man8/systemd-initctl.service.8.gz
diff --git a/files.udev b/files.udev
index 0b7e58fe..daf66aa9 100644
--- a/files.udev
+++ b/files.udev
@@ -4,7 +4,7 @@
 %config(noreplace) %{_sysconfdir}/systemd/pstore.conf
 %config(noreplace) %{_sysconfdir}/udev/udev.conf
 %if %{without bootstrap}
-# %%dir %{_libdir}/cryptsetup
+%dir %{_libdir}/cryptsetup
 %dir %{_modulesloaddir}
 %endif
 %dir %{_prefix}/lib/udev
@@ -35,9 +35,9 @@
 %{_datadir}/zsh/site-functions/_udevadm
 %endif
 %if %{without bootstrap}
-# %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so
-# %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so
-# %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so
+%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so
+%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so
+%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so
 %{_mandir}/man1/systemd-cryptenroll.1.gz
 %{_mandir}/man5/crypttab.5.gz
 %{_mandir}/man5/integritytab.5.gz
diff --git a/systemd.changes b/systemd.changes
index fe438c37..64113e4f 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Mon Sep  5 06:56:51 UTC 2022 - Franck Bui <fbui@suse.com>
+
+- rc-local.service.8 belongs to the systemd-sysvcompat sub-package (bsc#1203053)
+
+-------------------------------------------------------------------
+Fri Sep  2 20:17:01 UTC 2022 - Bob Haley <fawz@use.startmail.com>
+
+- Enable building and include libcryptsetup-plugins provided by systemd
+
+  Now that dracut 057 has been released we can enable building libcryptsetup
+  plugins. These can be used by cryptsetup to extend functionality including
+  fido2, pkcs11 and tpm2 support.
+
+-------------------------------------------------------------------
+Mon Aug 29 08:00:09 UTC 2022 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Let systemd trust the RTC for 30 years after the last update instead of 15 (bsc#1202356)
+
+  To allow for our systems to be used in edge locations without systemd updates
+  for a long time.
+
 -------------------------------------------------------------------
 Tue Aug 16 15:55:26 UTC 2022 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index eea6b0ff..0922fd48 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -661,6 +661,7 @@ Have fun with these services at your own risk.
         -Dsplit-bin=true \
         -Dsystem-uid-max=499 \
         -Dsystem-gid-max=499 \
+        -Dclock-valid-range-usec-max=946728000000000 \
         -Dadm-group=false \
         -Dwheel-group=false \
         -Ddefault-hierarchy=unified \
@@ -686,7 +687,6 @@ Have fun with these services at your own risk.
         -Dgshadow=false \
         -Dima=false \
         -Dldconfig=false \
-        -Dlibcryptsetup-plugins=false \
         -Dsmack=false \
         \
         -Dpstore=true \
@@ -696,6 +696,7 @@ Have fun with these services at your own risk.
         -Defi=%{when_not bootstrap} \
         -Delfutils=%{when_not bootstrap} \
         -Dhtml=%{when_not bootstrap} \
+        -Dlibcryptsetup-plugins=%{when_not bootstrap} \
         -Dman=%{when_not bootstrap} \
         -Dnss-myhostname=%{when_not bootstrap} \
         -Dnss-systemd=%{when_not bootstrap} \