diff --git a/split-files.py b/split-files.py
index 202d0fb..71371ca 100644
--- a/split-files.py
+++ b/split-files.py
@@ -77,6 +77,7 @@ for file in files(buildroot):
     elif re.search(r'''udev(?!\.pc)|
                        hwdb|
                        bootctl|
+                       sd-boot|systemd-boot\.|loader.conf|
                        bless-boot|
                        boot-system-token|
                        kernel-install|
@@ -89,14 +90,19 @@ for file in files(buildroot):
                        cryptsetup|
                        kmod|
                        quota|
+                       pstore|
                        sleep|suspend|hibernate|
                        systemd-tmpfiles-setup-dev|
                        network/99-default.link|
-                       growfs|makefs|makeswap|
+                       growfs|makefs|makeswap|mkswap|
+                       fsck|
+                       repart|
                        gpt-auto|
+                       volatile-root|
+                       verity-setup|
+                       remount-fs|
                        /boot$|
                        /boot/efi|
-                       remount-fs|
                        /kernel/|
                        /kernel$|
                        /modprobe.d
diff --git a/systemd.spec b/systemd.spec
index 2a19aee..a86757c 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -771,6 +771,10 @@ fi
 - "Upgrade" dependency on kbd package from Recommends to Requires (#1408878)
 - Move systemd-bless-boot.service and systemd-boot-system-token.service to
   systemd-udev subpackage (#1807462)
+- Move a bunch of other services to systemd-udev:
+  systemd-pstore.service, all fsck-related functionality,
+  systemd-volatile-root.service, systemd-verity-setup.service, and a few
+  other related files.
 
 * Fri Feb 21 2020 Filipe Brandenburger <filbranden@gmail.com> - 245~rc1-4
 - Update daemon-reexec fallback to check whether the system is booted with