diff --git a/srcpkgs/base-files/files/crypttab b/srcpkgs/base-files/files/crypttab
new file mode 100644
index 00000000000..196b0d6e816
--- /dev/null
+++ b/srcpkgs/base-files/files/crypttab
@@ -0,0 +1,13 @@
+# crypttab: mappings for encrypted partitions
+#
+# Each mapped device will be created in /dev/mapper, so your /etc/fstab
+# should use the /dev/mapper/<name> paths for encrypted devices.
+#
+# NOTE: Do not list your root (/) partition here.
+
+# <name>       <device>         <password>              <options>
+# home         /dev/hda4        /etc/mypassword1
+# data1        /dev/hda3        /etc/mypassword2
+# data2        /dev/hda5        /etc/cryptfs.key
+# swap         /dev/hdx4        /dev/urandom            swap,cipher=aes-cbc-essiv:sha256,size=256
+# vol          /dev/hdb7        none
diff --git a/srcpkgs/base-files/files/dracut.conf.d.voidlinux.conf b/srcpkgs/base-files/files/dracut.conf.d.voidlinux.conf
index 1c2ca982517..b4c3629c811 100644
--- a/srcpkgs/base-files/files/dracut.conf.d.voidlinux.conf
+++ b/srcpkgs/base-files/files/dracut.conf.d.voidlinux.conf
@@ -3,7 +3,7 @@
 #
 # Don't edit this file, it will be overwritten on next update.
 #
-add_dracutmodules+=" convertfs "
+add_dracutmodules+=" systemd "
 omit_dracutmodules+=" dash "
 omit_drivers+=" .*/fs/ocfs/.* "
 add_drivers+=" fbcon radeon i915 "
diff --git a/srcpkgs/base-files/files/fstab b/srcpkgs/base-files/files/fstab
new file mode 100644
index 00000000000..186e99fc329
--- /dev/null
+++ b/srcpkgs/base-files/files/fstab
@@ -0,0 +1,4 @@
+#
+# See fstab(5).
+#
+# <file system>	<dir>	<type>	<options>	<dump>	<pass>
diff --git a/srcpkgs/base-files/files/group b/srcpkgs/base-files/files/group
new file mode 100644
index 00000000000..1b645efe325
--- /dev/null
+++ b/srcpkgs/base-files/files/group
@@ -0,0 +1,23 @@
+root:x:0:
+bin:x:1:
+sys:x:2:
+kmem:x:3:
+wheel:x:4:
+tty:x:5:
+tape:x:6:
+daemon:x:7:
+floppy:x:8:
+disk:x:9:
+lp:x:10:
+dialout:x:11:
+audio:x:12:
+video:x:13:
+utmp:x:14:
+adm:x:15:
+cdrom:x:16:
+optical:x:17:
+mail:x:18:
+storage:x:19:
+scanner:x:20:
+nogroup:x:99:
+users:x:100:
diff --git a/srcpkgs/base-files/files/passwd b/srcpkgs/base-files/files/passwd
new file mode 100644
index 00000000000..70903ef514c
--- /dev/null
+++ b/srcpkgs/base-files/files/passwd
@@ -0,0 +1,2 @@
+root:x:0:0:root:/root:/bin/bash
+nobody:x:99:99:Unprivileged User:/dev/null:/bin/false
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 358e1e9c68f..df1a5806073 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,9 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.75
+version=0.76
 revision=1
-noarch=yes
-bootstrap=yes
 fulldepends="base-directories xbps-triggers"
 short_desc="Void Linux base system files"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,6 +11,9 @@ long_desc="
  This package installs the base system files that aren't installed by any
  other package and are required on any GNU/Linux system."
 
+noarch=yes
+bootstrap=yes
+
 conf_files="
 /etc/inputrc
 /etc/profile
@@ -23,7 +24,11 @@ conf_files="
 /etc/skel/.bash_logout
 /etc/skel/.bashrc
 /etc/skel/.inputrc
-/etc/issue"
+/etc/issue
+/etc/passwd
+/etc/group
+/etc/fstab
+/etc/crypttab"
 
 do_install() {
 	# Install misc config files.
@@ -32,7 +37,8 @@ do_install() {
 	done
 
 	vinstall ${FILESDIR}/securetty 600 etc
-	for f in profile hosts host.conf issue lsb-release inputrc; do
+	for f in profile hosts host.conf issue lsb-release \
+		inputrc fstab passwd group crypttab; do
 		vinstall ${FILESDIR}/${f} 644 etc
 	done
 	vmkdir etc/profile.d