diff --git a/meta-systemd/recipes-core/systemd/systemd/create-volatile.conf b/meta-systemd/recipes-core/systemd/systemd/create-volatile.conf
new file mode 100644
index 0000000..afcf8c3
--- /dev/null
+++ b/meta-systemd/recipes-core/systemd/systemd/create-volatile.conf
@@ -0,0 +1,11 @@
+# This goes hand-in-hand with the base-files of OE-Core. The file must
+# be sorted before 'systemd.conf' becuase this attempts to create a file
+# inside /var/log.
+
+
+d   /var/volatile/cache -   -   -   -
+d   /var/volatile/log   -   -   -   -
+d   /var/volatile/lock  -   -   -   -
+d   /var/volatile/run   -   -   -   -
+d   /var/volatile/tmp   -   -   -   -
+
diff --git a/meta-systemd/recipes-core/systemd/systemd_git.bb b/meta-systemd/recipes-core/systemd/systemd_git.bb
index 09bc635..2b245c0 100644
--- a/meta-systemd/recipes-core/systemd/systemd_git.bb
+++ b/meta-systemd/recipes-core/systemd/systemd_git.bb
@@ -19,7 +19,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r6"
+PR = "r7"
 
 inherit useradd pkgconfig autotools perlnative
 
@@ -31,6 +31,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \
            file://touchscreen.rules \
            file://modprobe.rules \
            file://var-run.conf \
+           file://create-volatile.conf \
            ${UCLIBCPATCHES} \
           "
 UCLIBCPATCHES = ""
@@ -97,6 +98,7 @@ do_install() {
 	install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
 
 	install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/
+	install -m 0644 ${WORKDIR}/create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
 }
 
 python populate_packages_prepend (){