diff --git a/systemd-mini.spec b/systemd-mini.spec
index 30e67a6c..599ca3cd 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -1179,7 +1179,9 @@ exit 0
 %{_bindir}/kernel-install
 %{_bindir}/hostnamectl
 %{_bindir}/localectl
+%if ! 0%{?bootstrap}
 %{_bindir}/machinectl
+%endif
 %{_bindir}/systemctl
 %{_bindir}/systemd-analyze
 %{_bindir}/coredumpctl
@@ -1322,7 +1324,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/systemd/user.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf
+%if !0%{?bootstrap}
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf
+%endif
 %if %{with networkd}
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf
 %endif
@@ -1351,11 +1355,15 @@ exit 0
 %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
+%if !0%{?bootstrap}
 %{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
+%endif
 %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service
 %dir %{_datadir}/polkit-1
 %dir %{_datadir}/polkit-1/actions
+%if !0%{?bootstrap}
 %{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
+%endif
 %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
diff --git a/systemd.spec b/systemd.spec
index 7a225483..75cd2d10 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1174,7 +1174,9 @@ exit 0
 %{_bindir}/kernel-install
 %{_bindir}/hostnamectl
 %{_bindir}/localectl
+%if ! 0%{?bootstrap}
 %{_bindir}/machinectl
+%endif
 %{_bindir}/systemctl
 %{_bindir}/systemd-analyze
 %{_bindir}/coredumpctl
@@ -1317,7 +1319,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/systemd/user.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf
+%if !0%{?bootstrap}
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf
+%endif
 %if %{with networkd}
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf
 %endif
@@ -1346,11 +1350,15 @@ exit 0
 %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
+%if !0%{?bootstrap}
 %{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
+%endif
 %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service
 %dir %{_datadir}/polkit-1
 %dir %{_datadir}/polkit-1/actions
+%if !0%{?bootstrap}
 %{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
+%endif
 %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy