diff --git a/pkg.info b/pkg.info
index 813d317..9364618 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,7 +1,7 @@
 name: filesystem
 description: The Tide Linux filesystem
 version: 1.3
-revision: 2
+revision: 3
 architecture: any
 keep: ["etc/hosts","etc/hostname","etc/group","etc/passwd","etc/gshadow","etc/shadow","etc/nsswitch.conf","etc/shells"]
 type: source
diff --git a/source-files/group b/source-files/group
index bd2872b..db57379 100644
--- a/source-files/group
+++ b/source-files/group
@@ -15,20 +15,10 @@ utmp:x:13:
 cdrom:x:15:
 adm:x:16:
 messagebus:x:18:
-systemd-journal:x:23:
 input:x:24:
 mail:x:34:
 kvm:x:61:
-systemd-journal-gateway:x:73:
-systemd-journal-remote:x:74:
-systemd-journal-upload:x:75:
-systemd-network:x:76:
-systemd-resolve:x:77:
-systemd-timesync:x:78:
-systemd-coredump:x:79:
 uuidd:x:80:
-systemd-oom:x:81:
 wheel:x:97:
-uucp:x:986:
 users:x:999:
 nogroup:x:65534:
diff --git a/source-files/nsswitch.conf b/source-files/nsswitch.conf
index 55134a7..23cd111 100644
--- a/source-files/nsswitch.conf
+++ b/source-files/nsswitch.conf
@@ -1,8 +1,8 @@
-passwd: files systemd
-group: files systemd
-shadow: files systemd
+passwd: files
+group: files
+shadow: files
 
-hosts: mymachines resolve [!UNAVAIL=return] files myhostname dns
+hosts: files dns
 networks: files
 
 protocols: files
diff --git a/source-files/passwd b/source-files/passwd
index f57e249..7093df2 100644
--- a/source-files/passwd
+++ b/source-files/passwd
@@ -2,13 +2,5 @@ root:x:0:0:root:/root:/bin/bash
 bin:x:1:1:bin:/dev/null:/usr/bin/false
 daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false
 messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/usr/bin/false
-systemd-journal-gateway:x:73:73:systemd Journal Gateway:/:/usr/bin/false
-systemd-journal-remote:x:74:74:systemd Journal Remote:/:/usr/bin/false
-systemd-journal-upload:x:75:75:systemd Journal Upload:/:/usr/bin/false
-systemd-network:x:76:76:systemd Network Management:/:/usr/bin/false
-systemd-resolve:x:77:77:systemd Resolver:/:/usr/bin/false
-systemd-timesync:x:78:78:systemd Time Synchronization:/:/usr/bin/false
-systemd-coredump:x:79:79:systemd Core Dumper:/:/usr/bin/false
 uuidd:x:80:80:UUID Generation Daemon User:/dev/null:/usr/bin/false
-systemd-oom:x:81:81:systemd Out Of Memory Daemon:/:/usr/bin/false
 nobody:x:65534:65534:Unprivileged User:/dev/null:/usr/bin/false
diff --git a/source.sh b/source.sh
index 5f392a8..6b78dfe 100644
--- a/source.sh
+++ b/source.sh
@@ -12,7 +12,6 @@ package() {
   install -dm755 "$BPM_OUTPUT"/proc
   install -dm755 "$BPM_OUTPUT"/sys
   install -dm755 "$BPM_OUTPUT"/run
-  install -dm755 "$BPM_OUTPUT"/tmp
   install -dm755 "$BPM_OUTPUT"/boot
   install -dm755 "$BPM_OUTPUT"/opt
   install -dm755 "$BPM_OUTPUT"/srv
@@ -29,8 +28,8 @@ package() {
   install -dm755 "$BPM_OUTPUT"/var/{cache,local,log,mail,opt,spool}
   install -dm755 "$BPM_OUTPUT"/var/lib/{color,misc,locate}
 
-  install -dm750 "$BPM_OUTPUT"/root
-  install -dm1777 /tmp "$BPM_OUTPUT"/var/tmp
+  mkdir -m750 "$BPM_OUTPUT"/root
+  mkdir -m1777 "$BPM_OUTPUT"/tmp "$BPM_OUTPUT"/var/tmp
 
   ln -s usr/bin "$BPM_OUTPUT"/bin
   ln -s usr/sbin "$BPM_OUTPUT"/sbin