diff --git a/TODO b/TODO
index b3d8e1afc5..8e822e7828 100644
--- a/TODO
+++ b/TODO
@@ -30,8 +30,6 @@ Features:
 * tmpfiles should allow two identical lines
   https://bugzilla.redhat.com/show_bug.cgi?id=690253
 
-* tmpfiles should create leading directories for d,D,f,F?
-
 * avoid any flag files, or readahead files in /, we need to support r/o /
   or / on tmpfs like Android setups.
 
diff --git a/src/tmpfiles.c b/src/tmpfiles.c
index e92b1123c6..70a9ebd831 100644
--- a/src/tmpfiles.c
+++ b/src/tmpfiles.c
@@ -466,6 +466,7 @@ static int create_item(Item *i) {
         case CREATE_DIRECTORY:
 
                 u = umask(0);
+                mkdir_parents(i->path, 0755);
                 r = mkdir(i->path, i->mode);
                 umask(u);