diff --git a/Makefile.am b/Makefile.am
index 0c3e970603..b55e0b954d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -809,12 +809,6 @@ systemd_shutdownd_LDADD = \
 	libsystemd-basic.la \
 	libsystemd-daemon.la
 
-dist_pkgdata_DATA = \
-	src/kbd-model-map
-
-dist_noinst_SCRIPT = \
-	src/generate-kbd-model-map
-
 systemd_shutdown_SOURCES = \
 	src/mount-setup.c \
 	src/umount.c \
@@ -1598,6 +1592,16 @@ INSTALL_DATA_HOOKS += \
 
 EXTRA_DIST += \
 	units/systemd-localed.service.in
+
+dist_pkgdata_DATA = \
+	src/locale/kbd-model-map
+
+dist_noinst_SCRIPT = \
+	src/locale/generate-kbd-model-map
+
+update-kbd-model-map:
+	src/locale/generate-kbd-model-map > src/locale/kbd-model-map
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -2340,6 +2344,3 @@ upload: all distcheck
 
 git-tag:
 	git tag "v$(VERSION)" -m "systemd $(VERSION)"
-
-update-kbd-model-map:
-	src/generate-kbd-model-map > src/kbd-model-map
diff --git a/src/generate-kbd-model-map b/src/locale/generate-kbd-model-map
similarity index 100%
rename from src/generate-kbd-model-map
rename to src/locale/generate-kbd-model-map
diff --git a/src/kbd-model-map b/src/locale/kbd-model-map
similarity index 100%
rename from src/kbd-model-map
rename to src/locale/kbd-model-map
diff --git a/src/localed.c b/src/localed.c
deleted file mode 100644
index e69de29bb2..0000000000