diff --git a/Makefile.am b/Makefile.am
index bc713fc21ff..f6d3445690c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1229,6 +1229,13 @@ CLEANFILES += \
 	$(dbusinterface_DATA)
 
 install-data-hook:
+	$(MKDIR_P) -m 0755 \
+                $(DESTDIR)$(sysconfdir)/modules-load.d \
+                $(DESTDIR)$(tmpfilesdir) \
+                $(DESTDIR)$(sysconfdir)/sysctl.d \
+                $(DESTDIR)$(systemshutdowndir) \
+                $(DESTDIR)$(systemgeneratordir) \
+                $(DESTDIR)$(usergeneratordir)
 	$(MKDIR_P) -m 0755 \
 		$(DESTDIR)$(systemunitdir) \
 		$(DESTDIR)$(userunitdir) \
diff --git a/TODO b/TODO
index c8e964a688a..1152927cacd 100644
--- a/TODO
+++ b/TODO
@@ -29,8 +29,13 @@ F15:
 
 * ConditionDirectoryNotEmpty= needs to be documented
 
+* add /etc/modules-load.d to rpm
+
 Features:
 
+* tmpfiles should allow two identical lines
+  https://bugzilla.redhat.com/show_bug.cgi?id=690253
+
 * teach dbus to activate all services it finds in /etc/systemd/services/org-*.service
 
 * document default dependencies