diff --git a/Makefile.am b/Makefile.am
index 9d41a2c..d940e82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1326,6 +1326,10 @@ dist_pkgsysconf_DATA += \
 	src/core/system.conf \
 	src/core/user.conf
 
+INSTALL_DIRS += \
+	$(pkgsysconfdir)/system.conf.d \
+	$(pkgsysconfdir)/user.conf.d
+
 dist_dbuspolicy_DATA += \
 	src/core/org.freedesktop.systemd1.conf
 
@@ -4670,6 +4674,9 @@ nodist_systemunit_DATA += \
 dist_pkgsysconf_DATA += \
 	src/journal/journald.conf
 
+INSTALL_DIRS += \
+	$(pkgsysconfdir)/journald.conf.d
+
 dist_catalog_DATA = \
 	catalog/systemd.fr.catalog \
 	catalog/systemd.it.catalog \
@@ -4783,6 +4790,9 @@ rootlibexec_PROGRAMS += \
 dist_pkgsysconf_DATA += \
 	src/journal/coredump.conf
 
+INSTALL_DIRS += \
+	$(pkgsysconfdir)/coredump.conf.d
+
 if HAVE_ACL
 systemd_coredump_LDADD += \
 	libsystemd-acl.la
@@ -4906,6 +4916,9 @@ rootlibexec_PROGRAMS += \
 dist_pkgsysconf_DATA += \
 	src/bootchart/bootchart.conf
 
+INSTALL_DIRS += \
+	$(pkgsysconfdir)/bootchart.conf.d
+
 nodist_systemunit_DATA += \
 	units/systemd-bootchart.service
 
@@ -5270,6 +5283,9 @@ EXTRA_DIST += \
 nodist_pkgsysconf_DATA += \
 	src/timesync/timesyncd.conf
 
+INSTALL_DIRS += \
+	$(pkgsysconfdir)/timesyncd.conf.d
+
 EXTRA_DIST += \
 	src/timesync/timesyncd.conf.in
 
@@ -5618,6 +5634,9 @@ GENERAL_ALIASES += \
 nodist_pkgsysconf_DATA += \
 	src/resolve/resolved.conf
 
+INSTALL_DIRS += \
+	$(pkgsysconfdir)/resolved.conf.d
+
 EXTRA_DIST += \
 	src/resolve/resolved.conf.in
 
@@ -6029,6 +6048,9 @@ dist_dbuspolicy_DATA += \
 dist_pkgsysconf_DATA += \
 	src/login/logind.conf
 
+INSTALL_DIRS += \
+	$(pkgsysconfdir)/logind.conf.d
+
 polkitpolicy_files += \
 	src/login/org.freedesktop.login1.policy