diff --git a/systemd-mini.changes b/systemd-mini.changes
index fa988b4c..b10856aa 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Mon Feb 26 10:47:39 UTC 2018 - fbui@suse.com
+
+- Fix build errors due to the split-off of systemd-containe:
+
+  found conflict of systemd-234-33.1.x86_64 with systemd-container-234-33.1.x86_64:
+    - /usr/share/man/man5/systemd.nspawn.5.gz
+    - /usr/share/man/man1/systemd-nspawn.1.gz
+  found conflict of systemd-container-234-33.1.x86_64 with systemd-mini-container-234-33.1.x86_64:
+    - /usr/bin/systemd-nspawn
+    - /usr/lib/systemd/system/systemd-nspawn@.service
+    - /usr/lib/tmpfiles.d/systemd-nspawn.conf
+	   
+-------------------------------------------------------------------
+Thu Feb 22 15:11:13 UTC 2018 - fvogt@suse.com
+
+- Use %license (boo#1082318)
+
+-------------------------------------------------------------------
+Thu Feb 22 14:57:19 UTC 2018 - fbui@suse.com
+
+- Split systemd-container sub-package off
+
+  Other distros already do it and it seems a good idea to not install
+  this stuff on new installations by default. At least
+  /var/lib/machines subvol is not created anymore at boot even if it
+  wasn't used at all.
+
 -------------------------------------------------------------------
 Mon Feb 19 14:26:51 UTC 2018 - fbui@suse.com
 
@@ -75,13 +103,13 @@ Fri Feb  9 07:59:56 UTC 2018 - fbui@suse.com
 
   The previous fix couldn't work on platforms using a RO
   rootfs. Therefore we don't ship /usr/lib/systemd/system/tmp.mnt but
-  we still ship a copy in /var.
+  we still ship a copy in /usr/share/systemd.
 
   Users who want to use tmpfs on /tmp are supposed to add a symlink in
-  /etc/ pointing to the copy shipped in /var.
+  /etc/ pointing to the copy shipped in /usr/share/systemd.
 
   To support the update path we automatically create the symlink if
-  tmp.mount in use is located in /usr.
+  tmp.mount in use is located in /usr/lib/systemd.
 
 -------------------------------------------------------------------
 Tue Feb  6 16:11:40 UTC 2018 - fbui@suse.com
diff --git a/systemd-mini.spec b/systemd-mini.spec
index cea9627c..c627c00b 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -293,6 +293,20 @@ Conflicts:      libudev-devel
 This package contains the development files for the library libudev, a
 dynamic library, which provides access to udev device information.
 
+%package container
+Summary:        Systemd tools for container management
+License:        LGPL-2.1+
+Group:          System/Base
+Requires:       %{name} = %{version}-%{release}
+%systemd_requires
+Provides:       systemd:%{_bindir}/systemd-nspawn
+
+%description container
+Systemd tools to spawn and manage containers and virtual machines.
+
+This package contains systemd-nspawn, machinectl, systemd-machined,
+and systemd-importd.
+
 %if ! 0%{?bootstrap}
 %package logger
 Summary:        Journal only logging
@@ -461,6 +475,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
 mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib}
 %else
 rm %{buildroot}%{_libdir}/libnss_systemd.so*
+rm %{buildroot}%{_bindir}/systemd-nspawn
+rm %{buildroot}%{_unitdir}/systemd-nspawn@.service
+rm %{buildroot}%{_tmpfilesdir}/systemd-nspawn.conf
 %endif
 
 # FIXME: these symlinks should die.
@@ -697,23 +714,6 @@ done
 %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || :
 
 if [ $1 -gt 1 ]; then
-        # Convert /var/lib/machines subvolume to make it suitable for
-        # rollbacks, if needed. See bsc#992573. The installer has been fixed
-        # to create it at installation time.
-        #
-        # The convertion might only be problematic for openSUSE distros
-        # (TW/Factory) where previous versions had already created the
-        # subvolume at the wrong place (via tmpfiles for example) and user
-        # started to populate and use it. In this case we'll let the user fix
-        # it manually.
-        #
-        # For SLE12 this subvolume was only introduced during the upgrade from
-        # v210 to v228 when we added this workaround. Note that the subvolume
-        # is still created at the wrong place due to the call to
-        # tmpfiles_create macro previously however it's empty so there
-        # shouldn't be any issues.
-        %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || :
-
         # Migrate i18n setting stuff thout could be previously
         # configured in /etc/sysconfig but now is defined only in the
         # systemd official places (/etc/locale.conf,
@@ -779,6 +779,26 @@ systemctl daemon-reload || :
 %postun -n libsystemd0%{?mini} -p /sbin/ldconfig
 
 %if ! 0%{?bootstrap}
+%post container
+if [ $1 -gt 1 ]; then
+        # Convert /var/lib/machines subvolume to make it suitable for
+        # rollbacks, if needed. See bsc#992573. The installer has been fixed
+        # to create it at installation time.
+        #
+        # The convertion might only be problematic for openSUSE distros
+        # (TW/Factory) where previous versions had already created the
+        # subvolume at the wrong place (via tmpfiles for example) and user
+        # started to populate and use it. In this case we'll let the user fix
+        # it manually.
+        #
+        # For SLE12 this subvolume was only introduced during the upgrade from
+        # v210 to v228 when we added this workaround. Note that the subvolume
+        # is still created at the wrong place due to the call to
+        # tmpfiles_create macro previously however it's empty so there
+        # shouldn't be any issues.
+        %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || :
+fi
+
 %post logger
 %tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/
 if [ "$1" -eq 1 ]; then
@@ -831,6 +851,7 @@ fi
 
 %files -f systemd.lang
 %defattr(-,root,root)
+%license LICENSE*
 /bin/systemd
 /bin/systemd-ask-password
 /bin/systemctl
@@ -842,9 +863,6 @@ fi
 %{_bindir}/kernel-install
 %{_bindir}/hostnamectl
 %{_bindir}/localectl
-%if %{with machined}
-%{_bindir}/machinectl
-%endif
 %{_bindir}/systemctl
 %{_bindir}/systemd-analyze
 %{_bindir}/coredumpctl
@@ -864,7 +882,6 @@ fi
 %{_bindir}/systemd-tty-ask-password-agent
 %{_bindir}/systemd-tmpfiles
 %{_bindir}/systemd-machine-id-setup
-%{_bindir}/systemd-nspawn
 %if %{with resolved}
 %{_bindir}/systemd-resolve
 %endif
@@ -896,6 +913,24 @@ fi
 %exclude %{_unitdir}/systemd-udev*.*
 %exclude %{_unitdir}/*.target.wants/systemd-udev*.*
 %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service
+%exclude %{_unitdir}/systemd-nspawn@.service
+%if %{with machined}
+%exclude %{_prefix}/lib/systemd/systemd-machined
+%exclude %{_unitdir}/systemd-machined.service
+%exclude %{_unitdir}/dbus-org.freedesktop.machine1.service
+%exclude %{_unitdir}/var-lib-machines.mount
+%exclude %{_unitdir}/machine.slice
+%exclude %{_unitdir}/machines.target*
+%exclude %{_unitdir}/*.target.wants/var-lib-machines.mount
+%endif
+%if %{with importd}
+%exclude %{_prefix}/lib/systemd/systemd-import*
+%exclude %{_prefix}/lib/systemd/systemd-pull
+%exclude %{_prefix}/lib/systemd/import-pubring.gpg
+%exclude %{_unitdir}/systemd-importd.service
+%exclude %{_unitdir}/dbus-org.freedesktop.import1.service
+%endif
+
 %{_unitdir}/*.automount
 %{_unitdir}/*.service
 %{_unitdir}/*.slice
@@ -914,6 +949,7 @@ fi
 %{_prefix}/lib/systemd/resolv.conf
 %endif
 %{_prefix}/lib/systemd/scripts
+%exclude %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh
 %dir %{_journalcatalogdir}
 %{_journalcatalogdir}/systemd.catalog
 %{_journalcatalogdir}/systemd.*.catalog
@@ -930,9 +966,6 @@ fi
 %dir %{_unitdir}/user@0.service.d
 %{_unitdir}/getty@tty1.service.d/noclear.conf
 %{_unitdir}/user@0.service.d/nodelagate.conf
-%if %{with importd}
-%{_prefix}/lib/systemd/import-pubring.gpg
-%endif
 /%{_lib}/security/pam_systemd.so
 
 %if %{with gnuefi}
@@ -949,6 +982,7 @@ fi
 %{_sysusersdir}/
 %dir %{_sysconfdir}/tmpfiles.d
 %{_tmpfilesdir}/
+%exclude %{_tmpfilesdir}/systemd-nspawn.conf
 
 %if %{with journal_remote}
 %exclude %{_sysusersdir}/systemd-remote.conf
@@ -998,9 +1032,6 @@ fi
 %{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf
-%if %{with machined}
-%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
-%endif
 %if %{with networkd}
 %{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
@@ -1009,9 +1040,6 @@ fi
 %{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
 %endif
-%if %{with importd}
-%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf
-%endif
 
 # Some files created at runtime.
 %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
@@ -1043,12 +1071,6 @@ fi
 %if %{with resolved}
 %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service
 %endif
-%if %{with machined}
-%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
-%endif
-%if %{with importd}
-%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service
-%endif
 
 %dir %{_datadir}/polkit-1
 %dir %{_datadir}/polkit-1/actions
@@ -1057,12 +1079,6 @@ fi
 %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
-%if %{with machined}
-%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
-%endif
-%if %{with importd}
-%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
-%endif
 %if %{with networkd}
 %{_datadir}/polkit-1/rules.d/systemd-networkd.rules
 %endif
@@ -1081,6 +1097,14 @@ fi
 %{_mandir}/man8/systemd-journald*
 %{_mandir}/man8/systemd-u[ps]*
 %{_mandir}/man8/30-systemd-environment-d-generator.*
+%exclude %{_mandir}/man*/*nspawn*
+%if %{with machined}
+%exclude %{_mandir}/man*/machinectl*
+%exclude %{_mandir}/man*/systemd-machined*
+%endif
+%if %{with importd}
+%exclude %{_mandir}/man*/systemd-importd*
+%endif
 %endif
 %{_docdir}/systemd
 
@@ -1203,6 +1227,44 @@ fi
 %endif
 
 %if ! 0%{?bootstrap}
+%files container
+%defattr(-,root,root)
+%{_bindir}/systemd-nspawn
+%{_unitdir}/systemd-nspawn@.service
+%{_tmpfilesdir}/systemd-nspawn.conf
+%if %{with machined}
+%{_bindir}/machinectl
+%{_prefix}/lib/systemd/systemd-machined
+%{_unitdir}/systemd-machined.service
+%{_unitdir}/dbus-org.freedesktop.machine1.service
+%{_unitdir}/var-lib-machines.mount
+%{_unitdir}/machine.slice
+%{_unitdir}/machines.target*
+%{_unitdir}/*.target.wants/var-lib-machines.mount
+%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh
+%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
+%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
+%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
+%endif
+%if %{with importd}
+%{_prefix}/lib/systemd/systemd-import*
+%{_prefix}/lib/systemd/systemd-pull
+%{_prefix}/lib/systemd/import-pubring.gpg
+%{_unitdir}/systemd-importd.service
+%{_unitdir}/dbus-org.freedesktop.import1.service
+%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf
+%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service
+%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
+%endif
+%{_mandir}/man*/*nspawn*
+%if %{with machined}
+%{_mandir}/man*/machinectl*
+%{_mandir}/man*/systemd-machined*
+%endif
+%if %{with importd}
+%{_mandir}/man*/systemd-importd*
+%endif
+
 %files logger
 %defattr(-,root,root)
 %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/
diff --git a/systemd.changes b/systemd.changes
index fa988b4c..b10856aa 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Mon Feb 26 10:47:39 UTC 2018 - fbui@suse.com
+
+- Fix build errors due to the split-off of systemd-containe:
+
+  found conflict of systemd-234-33.1.x86_64 with systemd-container-234-33.1.x86_64:
+    - /usr/share/man/man5/systemd.nspawn.5.gz
+    - /usr/share/man/man1/systemd-nspawn.1.gz
+  found conflict of systemd-container-234-33.1.x86_64 with systemd-mini-container-234-33.1.x86_64:
+    - /usr/bin/systemd-nspawn
+    - /usr/lib/systemd/system/systemd-nspawn@.service
+    - /usr/lib/tmpfiles.d/systemd-nspawn.conf
+	   
+-------------------------------------------------------------------
+Thu Feb 22 15:11:13 UTC 2018 - fvogt@suse.com
+
+- Use %license (boo#1082318)
+
+-------------------------------------------------------------------
+Thu Feb 22 14:57:19 UTC 2018 - fbui@suse.com
+
+- Split systemd-container sub-package off
+
+  Other distros already do it and it seems a good idea to not install
+  this stuff on new installations by default. At least
+  /var/lib/machines subvol is not created anymore at boot even if it
+  wasn't used at all.
+
 -------------------------------------------------------------------
 Mon Feb 19 14:26:51 UTC 2018 - fbui@suse.com
 
@@ -75,13 +103,13 @@ Fri Feb  9 07:59:56 UTC 2018 - fbui@suse.com
 
   The previous fix couldn't work on platforms using a RO
   rootfs. Therefore we don't ship /usr/lib/systemd/system/tmp.mnt but
-  we still ship a copy in /var.
+  we still ship a copy in /usr/share/systemd.
 
   Users who want to use tmpfs on /tmp are supposed to add a symlink in
-  /etc/ pointing to the copy shipped in /var.
+  /etc/ pointing to the copy shipped in /usr/share/systemd.
 
   To support the update path we automatically create the symlink if
-  tmp.mount in use is located in /usr.
+  tmp.mount in use is located in /usr/lib/systemd.
 
 -------------------------------------------------------------------
 Tue Feb  6 16:11:40 UTC 2018 - fbui@suse.com
diff --git a/systemd.spec b/systemd.spec
index 3d9cb358..95da200d 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -291,6 +291,20 @@ Conflicts:      libudev-devel
 This package contains the development files for the library libudev, a
 dynamic library, which provides access to udev device information.
 
+%package container
+Summary:        Systemd tools for container management
+License:        LGPL-2.1+
+Group:          System/Base
+Requires:       %{name} = %{version}-%{release}
+%systemd_requires
+Provides:       systemd:%{_bindir}/systemd-nspawn
+
+%description container
+Systemd tools to spawn and manage containers and virtual machines.
+
+This package contains systemd-nspawn, machinectl, systemd-machined,
+and systemd-importd.
+
 %if ! 0%{?bootstrap}
 %package logger
 Summary:        Journal only logging
@@ -459,6 +473,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
 mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib}
 %else
 rm %{buildroot}%{_libdir}/libnss_systemd.so*
+rm %{buildroot}%{_bindir}/systemd-nspawn
+rm %{buildroot}%{_unitdir}/systemd-nspawn@.service
+rm %{buildroot}%{_tmpfilesdir}/systemd-nspawn.conf
 %endif
 
 # FIXME: these symlinks should die.
@@ -695,23 +712,6 @@ done
 %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || :
 
 if [ $1 -gt 1 ]; then
-        # Convert /var/lib/machines subvolume to make it suitable for
-        # rollbacks, if needed. See bsc#992573. The installer has been fixed
-        # to create it at installation time.
-        #
-        # The convertion might only be problematic for openSUSE distros
-        # (TW/Factory) where previous versions had already created the
-        # subvolume at the wrong place (via tmpfiles for example) and user
-        # started to populate and use it. In this case we'll let the user fix
-        # it manually.
-        #
-        # For SLE12 this subvolume was only introduced during the upgrade from
-        # v210 to v228 when we added this workaround. Note that the subvolume
-        # is still created at the wrong place due to the call to
-        # tmpfiles_create macro previously however it's empty so there
-        # shouldn't be any issues.
-        %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || :
-
         # Migrate i18n setting stuff thout could be previously
         # configured in /etc/sysconfig but now is defined only in the
         # systemd official places (/etc/locale.conf,
@@ -777,6 +777,26 @@ systemctl daemon-reload || :
 %postun -n libsystemd0%{?mini} -p /sbin/ldconfig
 
 %if ! 0%{?bootstrap}
+%post container
+if [ $1 -gt 1 ]; then
+        # Convert /var/lib/machines subvolume to make it suitable for
+        # rollbacks, if needed. See bsc#992573. The installer has been fixed
+        # to create it at installation time.
+        #
+        # The convertion might only be problematic for openSUSE distros
+        # (TW/Factory) where previous versions had already created the
+        # subvolume at the wrong place (via tmpfiles for example) and user
+        # started to populate and use it. In this case we'll let the user fix
+        # it manually.
+        #
+        # For SLE12 this subvolume was only introduced during the upgrade from
+        # v210 to v228 when we added this workaround. Note that the subvolume
+        # is still created at the wrong place due to the call to
+        # tmpfiles_create macro previously however it's empty so there
+        # shouldn't be any issues.
+        %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || :
+fi
+
 %post logger
 %tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/
 if [ "$1" -eq 1 ]; then
@@ -829,6 +849,7 @@ fi
 
 %files -f systemd.lang
 %defattr(-,root,root)
+%license LICENSE*
 /bin/systemd
 /bin/systemd-ask-password
 /bin/systemctl
@@ -840,9 +861,6 @@ fi
 %{_bindir}/kernel-install
 %{_bindir}/hostnamectl
 %{_bindir}/localectl
-%if %{with machined}
-%{_bindir}/machinectl
-%endif
 %{_bindir}/systemctl
 %{_bindir}/systemd-analyze
 %{_bindir}/coredumpctl
@@ -862,7 +880,6 @@ fi
 %{_bindir}/systemd-tty-ask-password-agent
 %{_bindir}/systemd-tmpfiles
 %{_bindir}/systemd-machine-id-setup
-%{_bindir}/systemd-nspawn
 %if %{with resolved}
 %{_bindir}/systemd-resolve
 %endif
@@ -894,6 +911,24 @@ fi
 %exclude %{_unitdir}/systemd-udev*.*
 %exclude %{_unitdir}/*.target.wants/systemd-udev*.*
 %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service
+%exclude %{_unitdir}/systemd-nspawn@.service
+%if %{with machined}
+%exclude %{_prefix}/lib/systemd/systemd-machined
+%exclude %{_unitdir}/systemd-machined.service
+%exclude %{_unitdir}/dbus-org.freedesktop.machine1.service
+%exclude %{_unitdir}/var-lib-machines.mount
+%exclude %{_unitdir}/machine.slice
+%exclude %{_unitdir}/machines.target*
+%exclude %{_unitdir}/*.target.wants/var-lib-machines.mount
+%endif
+%if %{with importd}
+%exclude %{_prefix}/lib/systemd/systemd-import*
+%exclude %{_prefix}/lib/systemd/systemd-pull
+%exclude %{_prefix}/lib/systemd/import-pubring.gpg
+%exclude %{_unitdir}/systemd-importd.service
+%exclude %{_unitdir}/dbus-org.freedesktop.import1.service
+%endif
+
 %{_unitdir}/*.automount
 %{_unitdir}/*.service
 %{_unitdir}/*.slice
@@ -912,6 +947,7 @@ fi
 %{_prefix}/lib/systemd/resolv.conf
 %endif
 %{_prefix}/lib/systemd/scripts
+%exclude %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh
 %dir %{_journalcatalogdir}
 %{_journalcatalogdir}/systemd.catalog
 %{_journalcatalogdir}/systemd.*.catalog
@@ -928,9 +964,6 @@ fi
 %dir %{_unitdir}/user@0.service.d
 %{_unitdir}/getty@tty1.service.d/noclear.conf
 %{_unitdir}/user@0.service.d/nodelagate.conf
-%if %{with importd}
-%{_prefix}/lib/systemd/import-pubring.gpg
-%endif
 /%{_lib}/security/pam_systemd.so
 
 %if %{with gnuefi}
@@ -947,6 +980,7 @@ fi
 %{_sysusersdir}/
 %dir %{_sysconfdir}/tmpfiles.d
 %{_tmpfilesdir}/
+%exclude %{_tmpfilesdir}/systemd-nspawn.conf
 
 %if %{with journal_remote}
 %exclude %{_sysusersdir}/systemd-remote.conf
@@ -996,9 +1030,6 @@ fi
 %{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf
-%if %{with machined}
-%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
-%endif
 %if %{with networkd}
 %{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
@@ -1007,9 +1038,6 @@ fi
 %{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
 %endif
-%if %{with importd}
-%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf
-%endif
 
 # Some files created at runtime.
 %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
@@ -1041,12 +1069,6 @@ fi
 %if %{with resolved}
 %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service
 %endif
-%if %{with machined}
-%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
-%endif
-%if %{with importd}
-%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service
-%endif
 
 %dir %{_datadir}/polkit-1
 %dir %{_datadir}/polkit-1/actions
@@ -1055,12 +1077,6 @@ fi
 %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
-%if %{with machined}
-%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
-%endif
-%if %{with importd}
-%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
-%endif
 %if %{with networkd}
 %{_datadir}/polkit-1/rules.d/systemd-networkd.rules
 %endif
@@ -1079,6 +1095,14 @@ fi
 %{_mandir}/man8/systemd-journald*
 %{_mandir}/man8/systemd-u[ps]*
 %{_mandir}/man8/30-systemd-environment-d-generator.*
+%exclude %{_mandir}/man*/*nspawn*
+%if %{with machined}
+%exclude %{_mandir}/man*/machinectl*
+%exclude %{_mandir}/man*/systemd-machined*
+%endif
+%if %{with importd}
+%exclude %{_mandir}/man*/systemd-importd*
+%endif
 %endif
 %{_docdir}/systemd
 
@@ -1201,6 +1225,44 @@ fi
 %endif
 
 %if ! 0%{?bootstrap}
+%files container
+%defattr(-,root,root)
+%{_bindir}/systemd-nspawn
+%{_unitdir}/systemd-nspawn@.service
+%{_tmpfilesdir}/systemd-nspawn.conf
+%if %{with machined}
+%{_bindir}/machinectl
+%{_prefix}/lib/systemd/systemd-machined
+%{_unitdir}/systemd-machined.service
+%{_unitdir}/dbus-org.freedesktop.machine1.service
+%{_unitdir}/var-lib-machines.mount
+%{_unitdir}/machine.slice
+%{_unitdir}/machines.target*
+%{_unitdir}/*.target.wants/var-lib-machines.mount
+%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh
+%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
+%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
+%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
+%endif
+%if %{with importd}
+%{_prefix}/lib/systemd/systemd-import*
+%{_prefix}/lib/systemd/systemd-pull
+%{_prefix}/lib/systemd/import-pubring.gpg
+%{_unitdir}/systemd-importd.service
+%{_unitdir}/dbus-org.freedesktop.import1.service
+%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf
+%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service
+%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
+%endif
+%{_mandir}/man*/*nspawn*
+%if %{with machined}
+%{_mandir}/man*/machinectl*
+%{_mandir}/man*/systemd-machined*
+%endif
+%if %{with importd}
+%{_mandir}/man*/systemd-importd*
+%endif
+
 %files logger
 %defattr(-,root,root)
 %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/