diff --git a/.gitignore b/.gitignore
index 397b4a7..a312d93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.log
+build
diff --git a/Makefile b/Makefile
index 04ce85c..304781d 100644
--- a/Makefile
+++ b/Makefile
@@ -60,9 +60,13 @@ build: ensure-toolbox
 	# Create build directory
 	mkdir $(BUILDDIR)
 	# Create keys database directory
-	mkdir -p $(BUILDDIR)/var/db/xbps
+	mkdir -p $(BUILDDIR)/var/db/xbps $(BUILDDIR)/etc
 	# Import known keys
 	cp -r keys $(BUILDDIR)/var/db/xbps
+	# Create passwd, shadow and group file
+	cp files/passwd $(BUILDDIR)/etc/passwd
+	cp files/group $(BUILDDIR)/etc/group
+	cp files/shadow $(BUILDDIR)/etc/shadow
 	# Install packages into build directory
 	XBPS_ARCH="$(ARCH)" xbps-install -y -r $(BUILDDIR) --repository=$(REPO) -S $(PACKAGES)
 	# Create symlinks expected by void
@@ -92,10 +96,6 @@ endif
 	chmod +x $(BUILDDIR)/bin/xbps-remote
 	cp files/xbps-local $(BUILDDIR)/bin/xbps-local
 	chmod +x $(BUILDDIR)/bin/xbps-local
-	# Create passwd, shadow and group file
-	cp files/passwd $(BUILDDIR)/etc/passwd
-	cp files/group $(BUILDDIR)/etc/group
-	cp files/shadow $(BUILDDIR)/etc/shadow
 
 install: build
 	# Import directory as tar (owned by root) into docker
diff --git a/files/group b/files/group
index 492e8ce..fac18bd 100644
--- a/files/group
+++ b/files/group
@@ -1,3 +1,4 @@
 root:x:0:
 nogroup:x:99:
 users:x:100:
+xbuilder:x:101: