diff --git a/README.md b/README.md
index fc9fb2b..cd501cc 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,8 @@ Users of Arch ARM should NOT use this method as the distro package provides anal
 Users of other distros should install the following files:
 
 * `init/kodi.service` and `init/kodi-gbm.service` to `/usr/lib/systemd/system`
-* `sysusers.conf` to `/usr/lib/sysusers.d`, then run `systemd-sysusers`
-* `tmpfiles.conf` to `/usr/lib/tmpfiles.d`, then run `systemd-tmpfiles --create`
+* `init/sysusers.conf` to `/usr/lib/sysusers.d`, then run `systemd-sysusers`
+* `init/tmpfiles.conf` to `/usr/lib/tmpfiles.d`, then run `systemd-tmpfiles --create`
 
 Note that the kodi user's home directory is `/var/lib/kodi/` in this example, NOT `/home/kodi/` like a regular user.
 
diff --git a/init/sysusers.conf b/init/sysusers.conf
new file mode 100644
index 0000000..301939f
--- /dev/null
+++ b/init/sysusers.conf
@@ -0,0 +1,11 @@
+# override these settings by copying this to /etc/sysusers.d/ and modifying it therein
+
+#Type Name ID GECOS Home directory Shell
+g kodi - -
+u kodi - "Kodi User" /var/lib/kodi
+
+# supplemental groups
+m kodi audio
+m kodi optical
+m kodi uucp
+m kodi video
diff --git a/init/tmpfiles.conf b/init/tmpfiles.conf
new file mode 100644
index 0000000..615f016
--- /dev/null
+++ b/init/tmpfiles.conf
@@ -0,0 +1,3 @@
+#Type Path Mode User Group Age Argument
+d /var/lib/kodi 0750 kodi kodi - -
+Z /var/lib/kodi - kodi kodi - -
diff --git a/sysusers.conf b/sysusers.conf
deleted file mode 100644
index 0bd26dc..0000000
--- a/sysusers.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# == System users ==
-#   user    uid   descr     home
-u   kodi    -     Kodi      /var/lib/kodi
-
-# == Group memberships ==
-#   user    group
-m   kodi    audio
-m   kodi    optical
-m   kodi    uucp
-m   kodi    video
diff --git a/tmpfiles.conf b/tmpfiles.conf
deleted file mode 100644
index 8f2f9b6..0000000
--- a/tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d   /var/lib/kodi     0700    kodi  kodi  -