6 files changed, 9 insertions, 5 deletions
diff --git a/src/grp-system/libcore/src/Makefile b/src/grp-system/libcore/src/Makefile
index ab731a5b4f..e1229f2a39 100644
--- a/src/grp-system/libcore/src/Makefile
+++ b/src/grp-system/libcore/src/Makefile
@@ -125,8 +125,6 @@ libcore_la_SOURCES = \
 	src/core/locale-setup.c \
 	src/core/hostname-setup.c \
 	src/core/hostname-setup.h \
-	src/core/machine-id-setup.c \
-	src/core/machine-id-setup.h \
 	src/core/mount-setup.c \
 	src/core/mount-setup.h \
 	src/core/kmod-setup.c \
diff --git a/src/grp-system/systemd/Makefile b/src/grp-system/systemd/Makefile
index ab2a5fa7c8..e532386664 100644
--- a/src/grp-system/systemd/Makefile
+++ b/src/grp-system/systemd/Makefile
@@ -25,6 +25,8 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
 
 rootlibexec_PROGRAMS += systemd
 systemd_SOURCES = \
+	src/core/machine-id-setup.c \
+	src/core/machine-id-setup.h \
 	src/core/main.c
 
 systemd_CFLAGS = \
diff --git a/src/grp-system/systemd/machine-id-setup.c b/src/grp-system/systemd/machine-id-setup.c
new file mode 120000
index 0000000000..ac69689dea
--- /dev/null
+++ b/src/grp-system/systemd/machine-id-setup.c
@@ -0,0 +1 @@
+../../systemd-machine-id-setup/machine-id-setup.c
+\ No newline at end of file
diff --git a/src/grp-system/systemd/machine-id-setup.h b/src/grp-system/systemd/machine-id-setup.h
new file mode 120000
index 0000000000..70a81afdca
--- /dev/null
+++ b/src/grp-system/systemd/machine-id-setup.h
@@ -0,0 +1 @@
+../../systemd-machine-id-setup/machine-id-setup.h
+\ No newline at end of file
diff --git a/src/grp-system/systemd/main.c b/src/grp-system/systemd/main.c
index ec79485d6c..0600619f84 100644
--- a/src/grp-system/systemd/main.c
+++ b/src/grp-system/systemd/main.c
@@ -47,7 +47,6 @@
 #include "core/loopback-setup.h"
 #include "core/manager.h"
 #include "core/mount-setup.h"
-#include "machine-id-setup.h"
 #include "sd-bus/bus-error.h"
 #include "sd-bus/bus-util.h"
 #include "systemd-basic/alloc-util.h"
@@ -91,6 +90,8 @@
 #include "systemd-shared/switch-root.h"
 #include "systemd-shared/watchdog.h"
 
+#include "machine-id-setup.h"
+
 static enum {
         ACTION_RUN,
         ACTION_HELP,
diff --git a/src/systemd-machine-id-setup/Makefile b/src/systemd-machine-id-setup/Makefile
index 97f9087ac6..21a7cc47d4 100644
--- a/src/systemd-machine-id-setup/Makefile
+++ b/src/systemd-machine-id-setup/Makefile
@@ -25,11 +25,12 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
 
 rootbin_PROGRAMS += systemd-machine-id-setup
 systemd_machine_id_setup_SOURCES = \
+	src/core/machine-id-setup.c \
+	src/core/machine-id-setup.h \
 	src/machine-id-setup/machine-id-setup-main.c
 
 systemd_machine_id_setup_LDADD = \
-	libsystemd-basic.la \
-	libcore.la 
+	libsystemd-internal.la
 
 SYSINIT_TARGET_WANTS += \
 	systemd-machine-id-commit.service