diff --git a/debian/changelog b/debian/changelog
index f214f71e5b..40b6fddf15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+systemd (238-5ubuntu2) UNRELEASED; urgency=medium
+
+  * Disable dh_installinit generation of tmpfiles creation for the systemd
+    package in postinst, and replace with a manual safe call to
+    systemd-tmpfiles which will process any updates to the tmpfiles shipped by
+    systemd package, taking into account any overrides shipped by other
+    packages, sysadmin, or specified in the runtime directories. LP: #1748147
+
+ -- Dimitri John Ledkov 🌈 <xnox@ubuntu.com>  Thu, 21 Jun 2018 12:30:51 +0100
+
 systemd (238-5ubuntu1) cosmic; urgency=medium
 
   Merged from Debian Unstable, remaining changes are:
diff --git a/debian/rules b/debian/rules
index 71d04018f7..3524228520 100755
--- a/debian/rules
+++ b/debian/rules
@@ -263,7 +263,8 @@ override_dh_missing:
 	dh_missing --sourcedir debian/install/deb $(DH_MISSING)
 
 override_dh_installinit:
-	dh_installinit --no-start
+	dh_installinit --no-scripts -psystemd
+	dh_installinit --no-start -Nsystemd
 
 PROJECT_VERSION ?= $(shell awk '/PACKAGE_VERSION/ {print $$3}' build-deb/config.h | tr -d \")
 
diff --git a/debian/systemd.postinst b/debian/systemd.postinst
index dbd2260579..e907573240 100644
--- a/debian/systemd.postinst
+++ b/debian/systemd.postinst
@@ -176,4 +176,10 @@ if dpkg --compare-versions "$2" lt-nl "236-1~"; then
     rm -f /var/lib/systemd/clock
 fi
 
+# Process all tmpfiles that we ship, including any overrides in
+# runtime-dir/sysadmin-dir/other packages (e.g. rsyslog)
+#
+# Ignore if this fails, because e.g. %b will fail on WSL
+systemd-tmpfiles --create || :
+
 #DEBHELPER#