diff --git a/meta-oe/recipes-core/systemd/systemd/gtk-doc.make b/meta-oe/recipes-core/systemd/systemd-v189/gtk-doc.make
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd/gtk-doc.make
rename to meta-oe/recipes-core/systemd/systemd-v189/gtk-doc.make
diff --git a/meta-oe/recipes-core/systemd/systemd/modprobe.rules b/meta-oe/recipes-core/systemd/systemd-v189/modprobe.rules
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd/modprobe.rules
rename to meta-oe/recipes-core/systemd/systemd-v189/modprobe.rules
diff --git a/meta-oe/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch b/meta-oe/recipes-core/systemd/systemd-v189/systemd-pam-configure-check-uclibc.patch
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch
rename to meta-oe/recipes-core/systemd/systemd-v189/systemd-pam-configure-check-uclibc.patch
diff --git a/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch b/meta-oe/recipes-core/systemd/systemd-v189/systemd-pam-fix-execvpe.patch
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
rename to meta-oe/recipes-core/systemd/systemd-v189/systemd-pam-fix-execvpe.patch
diff --git a/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch b/meta-oe/recipes-core/systemd/systemd-v189/systemd-pam-fix-fallocate.patch
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
rename to meta-oe/recipes-core/systemd/systemd-v189/systemd-pam-fix-fallocate.patch
diff --git a/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch b/meta-oe/recipes-core/systemd/systemd-v189/systemd-pam-fix-getty-unit.patch
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch
rename to meta-oe/recipes-core/systemd/systemd-v189/systemd-pam-fix-getty-unit.patch
diff --git a/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch b/meta-oe/recipes-core/systemd/systemd-v189/systemd-pam-fix-mkostemp.patch
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch
rename to meta-oe/recipes-core/systemd/systemd-v189/systemd-pam-fix-mkostemp.patch
diff --git a/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch b/meta-oe/recipes-core/systemd/systemd-v189/systemd-pam-fix-msformat.patch
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch
rename to meta-oe/recipes-core/systemd/systemd-v189/systemd-pam-fix-msformat.patch
diff --git a/meta-oe/recipes-core/systemd/systemd/touchscreen.rules b/meta-oe/recipes-core/systemd/systemd-v189/touchscreen.rules
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd/touchscreen.rules
rename to meta-oe/recipes-core/systemd/systemd-v189/touchscreen.rules
diff --git a/meta-oe/recipes-core/systemd/systemd/use-rootlibdir.patch b/meta-oe/recipes-core/systemd/systemd-v189/use-rootlibdir.patch
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd/use-rootlibdir.patch
rename to meta-oe/recipes-core/systemd/systemd-v189/use-rootlibdir.patch
diff --git a/meta-oe/recipes-core/systemd/systemd-v189/var-run.conf b/meta-oe/recipes-core/systemd/systemd-v189/var-run.conf
new file mode 100644
index 0000000000..c2c18e2b99
--- /dev/null
+++ b/meta-oe/recipes-core/systemd/systemd-v189/var-run.conf
@@ -0,0 +1,4 @@
+# empty /var/run
+R	/var/run/*	-	-	-	-	-
+# systemd-update-utmp-runlevel.service fails to start without this
+f /var/run/utmp 0644 root root - -
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_v189.bb
similarity index 99%
rename from meta-oe/recipes-core/systemd/systemd_git.bb
rename to meta-oe/recipes-core/systemd/systemd_v189.bb
index 712ec7982b..613f703ba0 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_v189.bb
@@ -15,10 +15,6 @@ SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
 
 SECTION = "base/shell"
 
-inherit gitpkgv
-PKGV = "v${GITPKGVTAG}"
-
-PV = "git"
 PR = "r6"
 
 inherit useradd pkgconfig autotools perlnative