diff --git a/Makefile.am b/Makefile.am
index 54cc5096f4..74efb0cf62 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -588,8 +588,6 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/cgroup-util.h \
 	src/shared/dbus-common.c \
 	src/shared/dbus-common.h \
-	src/shared/hostname-setup.c \
-	src/shared/hostname-setup.h \
 	src/shared/logs-show.c \
 	src/shared/logs-show.h \
 	src/shared/cgroup-show.c \
@@ -765,6 +763,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/kmod-setup.h \
 	src/core/locale-setup.h \
 	src/core/locale-setup.c \
+	src/core/hostname-setup.c \
+	src/core/hostname-setup.h \
 	src/core/fdset.c \
 	src/core/fdset.h \
 	src/core/condition.c \
@@ -860,7 +860,7 @@ test_hostname_SOURCES = \
 	src/test/test-hostname.c
 
 test_hostname_LDADD = \
-	libsystemd-shared.la
+	libsystemd-core.la
 
 test_daemon_SOURCES = \
 	src/test/test-daemon.c
diff --git a/src/shared/hostname-setup.c b/src/core/hostname-setup.c
similarity index 100%
rename from src/shared/hostname-setup.c
rename to src/core/hostname-setup.c
diff --git a/src/shared/hostname-setup.h b/src/core/hostname-setup.h
similarity index 100%
rename from src/shared/hostname-setup.h
rename to src/core/hostname-setup.h