diff --git a/meson.build b/meson.build
index 239f13c061..f2b975abc5 100644
--- a/meson.build
+++ b/meson.build
@@ -1441,6 +1441,7 @@ includes = include_directories('src/basic',
                                'src/udev',
                                'src/libudev',
                                'src/core',
+                               'src/shutdown',
                                'src/libsystemd/sd-bus',
                                'src/libsystemd/sd-device',
                                'src/libsystemd/sd-event',
@@ -1527,6 +1528,7 @@ public_programs = []
 subdir('src/libudev')
 subdir('src/shared')
 subdir('src/core')
+subdir('src/shutdown')
 subdir('src/udev')
 subdir('src/network')
 
@@ -2676,6 +2678,10 @@ public_programs += exe
 
 executable('systemd-shutdown',
            systemd_shutdown_sources,
+           'src/core/mount-setup.c',
+           'src/core/mount-setup.h',
+           'src/core/killall.c',
+           'src/core/killall.h',
            include_directories : includes,
            link_with : [libshared],
            dependencies : [libmount],
diff --git a/src/core/meson.build b/src/core/meson.build
index 88fb093732..6f387c4796 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -163,16 +163,6 @@ libcore = static_library(
 
 systemd_sources = files('main.c')
 
-systemd_shutdown_sources = files('''
-        shutdown.c
-        umount.c
-        umount.h
-        mount-setup.c
-        mount-setup.h
-        killall.c
-        killall.h
-'''.split())
-
 in_files = [['macros.systemd',   rpmmacrosdir],
             ['system.conf',      pkgsysconfdir],
             ['systemd.pc',       pkgconfigdatadir],
diff --git a/src/shutdown/meson.build b/src/shutdown/meson.build
new file mode 100644
index 0000000000..ebf0bed242
--- /dev/null
+++ b/src/shutdown/meson.build
@@ -0,0 +1,5 @@
+systemd_shutdown_sources = files('''
+        shutdown.c
+        umount.c
+        umount.h
+'''.split())
diff --git a/src/core/shutdown.c b/src/shutdown/shutdown.c
similarity index 100%
rename from src/core/shutdown.c
rename to src/shutdown/shutdown.c
diff --git a/src/core/umount.c b/src/shutdown/umount.c
similarity index 100%
rename from src/core/umount.c
rename to src/shutdown/umount.c
diff --git a/src/core/umount.h b/src/shutdown/umount.h
similarity index 100%
rename from src/core/umount.h
rename to src/shutdown/umount.h
diff --git a/src/test/meson.build b/src/test/meson.build
index c53b9653f9..e43f119230 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -716,8 +716,8 @@ tests += [
         [['src/test/test-umount.c',
           'src/core/mount-setup.c',
           'src/core/mount-setup.h',
-          'src/core/umount.c',
-          'src/core/umount.h'],
+          'src/shutdown/umount.c',
+          'src/shutdown/umount.h'],
          [],
          [libmount]],