diff --git a/.etckeeper b/.etckeeper
index 49d82c2e..da43cd56 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -603,10 +603,6 @@ maybe chmod 0755 'sensors.d'
 maybe chmod 0644 'sensors.d/.placeholder'
 maybe chmod 0644 'sensors3.conf'
 maybe chmod 0644 'services'
-maybe chgrp 'shadow' 'shadow'
-maybe chmod 0640 'shadow'
-maybe chgrp 'shadow' 'shadow-'
-maybe chmod 0640 'shadow-'
 maybe chmod 0644 'shells'
 maybe chmod 0755 'skel'
 maybe chmod 0644 'skel/.bash_logout'
diff --git a/.gitignore b/.gitignore
index 9196cf5c..8646cf10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@ check_mk/logwatch.state
 DEADJOE
 
 # end section managed by etckeeper
+shadow*
diff --git a/shadow b/shadow
deleted file mode 100644
index 96963107..00000000
--- a/shadow
+++ /dev/null
@@ -1,29 +0,0 @@
-root:$y$j9T$13ZdvoRjQN4zpEQPlMoFf1$Uji8UbWEUghaspcAyeDyrw9ekP.4AQ/MXhSBQ2TP694:19128:0:99999:7:::
-daemon:*:19086:0:99999:7:::
-bin:*:19086:0:99999:7:::
-sys:*:19086:0:99999:7:::
-sync:*:19086:0:99999:7:::
-games:*:19086:0:99999:7:::
-man:*:19086:0:99999:7:::
-lp:*:19086:0:99999:7:::
-mail:*:19086:0:99999:7:::
-news:*:19086:0:99999:7:::
-uucp:*:19086:0:99999:7:::
-proxy:*:19086:0:99999:7:::
-www-data:*:19086:0:99999:7:::
-backup:*:19086:0:99999:7:::
-list:*:19086:0:99999:7:::
-irc:*:19086:0:99999:7:::
-gnats:*:19086:0:99999:7:::
-nobody:*:19086:0:99999:7:::
-_apt:*:19086:0:99999:7:::
-systemd-network:*:19086:0:99999:7:::
-systemd-resolve:*:19086:0:99999:7:::
-pi:$5$pkTLkyGy2C$urIEmpE39/yAFROPXuiZPTLF4FfWOPnzZj2xFCJI6QD:19086:0:99999:7:::
-systemd-timesync:*:19086:0:99999:7:::
-messagebus:*:19086:0:99999:7:::
-_rpc:*:19086:0:99999:7:::
-sshd:*:19086:0:99999:7:::
-statd:*:19086:0:99999:7:::
-avahi:*:19086:0:99999:7:::
-systemd-coredump:!*:19086::::::
diff --git a/shadow- b/shadow-
deleted file mode 100644
index 24948361..00000000
--- a/shadow-
+++ /dev/null
@@ -1,29 +0,0 @@
-root:*:19086:0:99999:7:::
-daemon:*:19086:0:99999:7:::
-bin:*:19086:0:99999:7:::
-sys:*:19086:0:99999:7:::
-sync:*:19086:0:99999:7:::
-games:*:19086:0:99999:7:::
-man:*:19086:0:99999:7:::
-lp:*:19086:0:99999:7:::
-mail:*:19086:0:99999:7:::
-news:*:19086:0:99999:7:::
-uucp:*:19086:0:99999:7:::
-proxy:*:19086:0:99999:7:::
-www-data:*:19086:0:99999:7:::
-backup:*:19086:0:99999:7:::
-list:*:19086:0:99999:7:::
-irc:*:19086:0:99999:7:::
-gnats:*:19086:0:99999:7:::
-nobody:*:19086:0:99999:7:::
-_apt:*:19086:0:99999:7:::
-systemd-network:*:19086:0:99999:7:::
-systemd-resolve:*:19086:0:99999:7:::
-pi:*:19086:0:99999:7:::
-systemd-timesync:*:19086:0:99999:7:::
-messagebus:*:19086:0:99999:7:::
-_rpc:*:19086:0:99999:7:::
-sshd:*:19086:0:99999:7:::
-statd:*:19086:0:99999:7:::
-avahi:*:19086:0:99999:7:::
-systemd-coredump:!*:19086::::::