diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 05176c5..fab6100 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -9,20 +9,18 @@ arch=('x86_64')
 license=('GPL')
 url='https://archlinux.org'
 depends=('iana-etc')
-backup=('etc/crypttab' 'etc/fstab' 'etc/group' 'etc/gshadow' 'etc/host.conf'
+backup=('etc/crypttab' 'etc/fstab' 'etc/host.conf'
         'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/nsswitch.conf'
-        'etc/passwd' 'etc/profile' 'etc/resolv.conf' 'etc/securetty'
-        'etc/shadow' 'etc/shells' 'etc/subuid' 'etc/subgid')
-source=('crypttab' 'env-generator' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts'
+        'etc/profile' 'etc/resolv.conf' 'etc/securetty'
+        'etc/shells' 'etc/subuid' 'etc/subgid')
+source=('crypttab' 'env-generator' 'fstab' 'host.conf' 'hosts'
         'issue' 'ld.so.conf' 'locale.sh' 'nsswitch.conf' 'os-release' 'profile'
-        'passwd' 'resolv.conf' 'securetty' 'shadow' 'shells' 'sysctl' 'sysusers'
+        'resolv.conf' 'securetty' 'shells' 'sysctl' 'sysusers'
         'tmpfiles' 'subuid' 'subgid' 'archlinux-logo.svg' 'archlinux-logo.png'
         'archlinux-logo-text.svg' 'archlinux-logo-text-dark.svg')
 sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82'
             'ed0cb4f1db4021f8c3b5ce78fdf91d2c0624708f58f36c9cf867f4d93c3bc6da'
             'e54626e74ed8fee4173b62a545ab1c3a3a069e4217a0ee8fc398d9933e9c1696'
-            '244f0718ee2a9d6862ae59d6c18c1dd1568651eada91a704574fa527fbac2b3a'
-            '90d879374f77bac47f132164c1e7fc4892e994ff1d1ac376efa0c1c26ea37273'
             '4d7b647169063dfedbff5e1e22cee77bd1a4183dbcfd5e802e68939da4bbf733'
             'd9cd8a77d9e0aa5e90d7f4ed74c8745c17b525e720e28e4c44364150003c35f9'
             'c774dbbcaea38ee1c1141d0daf82aa8177bfb26aca896d6f0c4ccdc902f6ac42'
@@ -31,14 +29,12 @@ sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82'
             'c8ee7a9faf798caab178ec51afae4146f1efd8a716b7acedf28345b6c75f9697'
             '46108f7e84f5d5994678133d412d5ec6222c53f28e6bf7ac66cc07788a7ee66d'
             '5e4088ad8d0853d390fa303f6be8c3f69c33834200cba9e90f7849f1993ca8d0'
-            '5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a'
             '5557d8e601b17a80d1ea7de78a9869be69637cb6a02fbfe334e22fdf64e61d4c'
             'd88be2b45b43605ff31dd83d6a138069b6c2e92bc8989b7b9ab9eba8da5f8c7b'
-            '6e13705ac4d6f69cdba118c6b70c722346fd3c45224133e6bbfe28aca719563c'
             'c390b31fffc4a2b5d78ae8c89f5317aadef1f71baac09cfb467b675db1406d61'
             '89e43a0b7028f52d5c8e7fb961d962c4b4f4e9595880a6157274ddb2c7c0b6b4'
             'b5b28f395583d141d88c0b955cd05124f9b8cdf003feab01e55885b8e8c1303e'
-            '5d8e61479f0093852365090e84d8d95b1e7fccfab068274ee25863bde6ff3e07'
+            'b2da7b32d6dc04cfa807764f6f00bce4bb649a3794336435ce958e1683056f14'
             'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
             'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
             '3ffe8ea4e98db43a3ec4dcca55fd4009cd8b8d220f0996aef7a5b427fdf65234'
@@ -63,16 +59,14 @@ package() {
 
   # setup /etc and /usr/share/factory/etc
   install -d etc/{ld.so.conf.d,skel,profile.d} usr/share/factory/etc
-  for f in fstab group host.conf hosts issue ld.so.conf nsswitch.conf \
-  passwd resolv.conf securetty shells profile subuid subgid; do
+  for f in fstab host.conf hosts issue ld.so.conf nsswitch.conf \
+  resolv.conf securetty shells profile subuid subgid; do
     install -m644 "$srcdir"/$f etc/
     install -m644 "$srcdir"/$f usr/share/factory/etc/
   done
   ln -s ../proc/self/mounts etc/mtab
-  for f in gshadow shadow crypttab; do
-    install -m600 "$srcdir"/$f etc/
-    install -m600 "$srcdir"/$f usr/share/factory/etc/
-  done
+  install -m600 "$srcdir"/crypttab etc/
+  install -m600 "$srcdir"/crypttab usr/share/factory/etc/
   touch etc/arch-release
   install -m644 "$srcdir"/locale.sh etc/profile.d/locale.sh
   install -Dm644 "$srcdir"/os-release usr/lib/os-release
diff --git a/trunk/group b/trunk/group
deleted file mode 100644
index 18acc30..0000000
--- a/trunk/group
+++ /dev/null
@@ -1 +0,0 @@
-root:x:0:root
diff --git a/trunk/gshadow b/trunk/gshadow
deleted file mode 100644
index 3d5d111..0000000
--- a/trunk/gshadow
+++ /dev/null
@@ -1 +0,0 @@
-root:::root
diff --git a/trunk/passwd b/trunk/passwd
deleted file mode 100644
index 909d89b..0000000
--- a/trunk/passwd
+++ /dev/null
@@ -1 +0,0 @@
-root:x:0:0::/root:/bin/bash
diff --git a/trunk/shadow b/trunk/shadow
deleted file mode 100644
index a8860d1..0000000
--- a/trunk/shadow
+++ /dev/null
@@ -1 +0,0 @@
-root:*:14871::::::
diff --git a/trunk/tmpfiles b/trunk/tmpfiles
index 04f8d12..8e0b960 100644
--- a/trunk/tmpfiles
+++ b/trunk/tmpfiles
@@ -2,17 +2,13 @@
 
 C /etc/crypttab
 C /etc/fstab
-C /etc/group
-C /etc/gshadow
 C /etc/host.conf
 C /etc/hosts
 C /etc/issue
 C /etc/ld.so.conf
 C /etc/nsswitch.conf
-C /etc/passwd
 C /etc/profile
 C /etc/securetty
-C /etc/shadow
 C /etc/shells
 C /etc/subuid
 C /etc/subgid