diff --git a/Makefile.am b/Makefile.am
index 84f8593ba7..1e3eb4deed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4397,17 +4397,17 @@ systemd_socket_proxyd_LDADD = \
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
-	src/journal/coredump.c \
-	src/journal/coredump-vacuum.c \
-	src/journal/coredump-vacuum.h
+	src/coredump/coredump.c \
+	src/coredump/coredump-vacuum.c \
+	src/coredump/coredump-vacuum.h
 
 systemd_coredump_LDADD = \
 	libshared.la
 
 if HAVE_ELFUTILS
 systemd_coredump_SOURCES += \
-	src/journal/stacktrace.c \
-	src/journal/stacktrace.h
+	src/coredump/stacktrace.c \
+	src/coredump/stacktrace.h
 
 systemd_coredump_LDADD += \
 	$(ELFUTILS_LIBS)
@@ -4417,10 +4417,10 @@ rootlibexec_PROGRAMS += \
 	systemd-coredump
 
 dist_pkgsysconf_DATA += \
-	src/journal/coredump.conf
+	src/coredump/coredump.conf
 
 coredumpctl_SOURCES = \
-	src/journal/coredumpctl.c
+	src/coredump/coredumpctl.c
 
 coredumpctl_LDADD = \
 	libshared.la
@@ -4432,9 +4432,9 @@ manual_tests += \
 	test-coredump-vacuum
 
 test_coredump_vacuum_SOURCES = \
-	src/journal/test-coredump-vacuum.c  \
-	src/journal/coredump-vacuum.c \
-	src/journal/coredump-vacuum.h
+	src/coredump/test-coredump-vacuum.c  \
+	src/coredump/coredump-vacuum.c \
+	src/coredump/coredump-vacuum.h
 
 test_coredump_vacuum_LDADD = \
 	libshared.la
diff --git a/src/coredump/Makefile b/src/coredump/Makefile
new file mode 120000
index 0000000000..d0b0e8e008
--- /dev/null
+++ b/src/coredump/Makefile
@@ -0,0 +1 @@
+../Makefile
\ No newline at end of file
diff --git a/src/journal/coredump-vacuum.c b/src/coredump/coredump-vacuum.c
similarity index 100%
rename from src/journal/coredump-vacuum.c
rename to src/coredump/coredump-vacuum.c
diff --git a/src/journal/coredump-vacuum.h b/src/coredump/coredump-vacuum.h
similarity index 100%
rename from src/journal/coredump-vacuum.h
rename to src/coredump/coredump-vacuum.h
diff --git a/src/journal/coredump.c b/src/coredump/coredump.c
similarity index 100%
rename from src/journal/coredump.c
rename to src/coredump/coredump.c
diff --git a/src/journal/coredump.conf b/src/coredump/coredump.conf
similarity index 100%
rename from src/journal/coredump.conf
rename to src/coredump/coredump.conf
diff --git a/src/journal/coredumpctl.c b/src/coredump/coredumpctl.c
similarity index 100%
rename from src/journal/coredumpctl.c
rename to src/coredump/coredumpctl.c
diff --git a/src/journal/stacktrace.c b/src/coredump/stacktrace.c
similarity index 100%
rename from src/journal/stacktrace.c
rename to src/coredump/stacktrace.c
diff --git a/src/journal/stacktrace.h b/src/coredump/stacktrace.h
similarity index 100%
rename from src/journal/stacktrace.h
rename to src/coredump/stacktrace.h
diff --git a/src/journal/test-coredump-vacuum.c b/src/coredump/test-coredump-vacuum.c
similarity index 100%
rename from src/journal/test-coredump-vacuum.c
rename to src/coredump/test-coredump-vacuum.c