diff --git a/files.udev b/files.udev
index 389f9592..c3e2473c 100644
--- a/files.udev
+++ b/files.udev
@@ -5,8 +5,6 @@
 %if ! %{bootstrap}
 %dir %{_libdir}/cryptsetup
 %dir %{_modulesloaddir}
-%dir %{_prefix}/lib/kernel
-%dir %{_prefix}/lib/kernel/install.d
 %endif
 %dir %{_prefix}/lib/udev
 %if ! %{bootstrap}
@@ -23,18 +21,15 @@
 %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation
 %ghost %{_localstatedir}/lib/systemd/backlight
 %if ! %{bootstrap}
-%{_bindir}/kernel-install
 %{_bindir}/systemd-cryptenroll
 %endif
 %{_bindir}/systemd-hwdb
 %{_bindir}/udevadm
 %if ! %{bootstrap}
-%{_datadir}/bash-completion/completions/kernel-install
 %{_datadir}/bash-completion/completions/udevadm
 %endif
 %{_datadir}/pkgconfig/udev.pc
 %if ! %{bootstrap}
-%{_datadir}/zsh/site-functions/_kernel-install
 %{_datadir}/zsh/site-functions/_udevadm
 %endif
 %if ! %{bootstrap}
@@ -49,7 +44,6 @@
 %{_mandir}/man5/veritytab.5.gz
 %{_mandir}/man7/hwdb.7.gz
 %{_mandir}/man7/udev.7.gz
-%{_mandir}/man8/kernel-install.8.gz
 %{_mandir}/man8/systemd-backlight.8.gz
 %{_mandir}/man8/systemd-backlight@.service.8.gz
 %{_mandir}/man8/systemd-cryptsetup-generator.8.gz
@@ -84,9 +78,6 @@
 %{_mandir}/man8/systemd-volatile-root.8.gz
 %{_mandir}/man8/systemd-volatile-root.service.8.gz
 %{_mandir}/man8/udevadm.8.gz
-%{_prefix}/lib/kernel/install.conf
-%{_prefix}/lib/kernel/install.d/50-depmod.install
-%{_prefix}/lib/kernel/install.d/90-loaderentry.install
 %endif
 %{_prefix}/lib/udev/ata_id
 %{_prefix}/lib/udev/cdrom_id
diff --git a/files.uefi-boot b/files.uefi-boot
index ebb3ff29..49bcdfec 100644
--- a/files.uefi-boot
+++ b/files.uefi-boot
@@ -2,12 +2,17 @@
 # Please keep the list sorted (with `LC_ALL=C sort`).
 #
 %if %{with sd_boot}
+%dir %{_prefix}/lib/kernel
+%dir %{_prefix}/lib/kernel/install.d
 %dir %{_systemd_util_dir}/boot
 %dir %{_systemd_util_dir}/boot/efi
 %{_bindir}/bootctl
+%{_bindir}/kernel-install
 %if ! %{bootstrap}
 %{_datadir}/bash-completion/completions/bootctl
+%{_datadir}/bash-completion/completions/kernel-install
 %{_datadir}/zsh/site-functions/_bootctl
+%{_datadir}/zsh/site-functions/_kernel-install
 %{_mandir}/man1/bootctl.1.gz
 %{_mandir}/man5/loader.conf.5.gz
 %{_mandir}/man7/linuxaa64.efi.stub.7.gz
@@ -16,11 +21,15 @@
 %{_mandir}/man7/sd-boot.7.gz
 %{_mandir}/man7/systemd-boot.7.gz
 %{_mandir}/man7/systemd-stub.7.gz
+%{_mandir}/man8/kernel-install.8.gz
 %{_mandir}/man8/systemd-bless-boot-generator.8.gz
 %{_mandir}/man8/systemd-bless-boot.8.gz
 %{_mandir}/man8/systemd-bless-boot.service.8.gz
 %{_mandir}/man8/systemd-boot-system-token.service.8.gz
 %endif
+%{_prefix}/lib/kernel/install.conf
+%{_prefix}/lib/kernel/install.d/50-depmod.install
+%{_prefix}/lib/kernel/install.d/90-loaderentry.install
 # These are part of the very few exceptions where glob pattern is allowd.
 %{_systemd_util_dir}/boot/efi/linux*.efi.stub
 %{_systemd_util_dir}/boot/efi/linux*.elf.stub