diff --git a/Makefile b/Makefile
index 2fe7ee2..f6219d3 100644
--- a/Makefile
+++ b/Makefile
@@ -70,12 +70,20 @@ metal: mnt-drive mnt-system base set-loc set-resolv set-fstab set-root grub
 tools:
 	$(call vinstall,base-devel git tcc wget vim-x11 tmux)
 
-post-install:
+post-install: tools
 	cp post-install.sh $(MNTDIR)/usr/local/bin/
 	chmod 755 $(MNTDIR)/usr/local/bin/post-install.sh
 	chroot $(MNTDIR) /usr/local/bin/post-install.sh
+	chroot $(MNTDIR) ln -s /usr/share/zoneinfo/$(TIMEZN) /etc/localtime
+	echo $(HSTNM) > $(MNTDIR)/etc/hostname
+	cp first-boot.sh $(MNTDIR)/usr/local/bin/first-boot.sh
+	chmod 755 $(MNTDIR)/usr/local/bin/first-boot.sh
 
-laptop: metal wifi xorg audio
+nuser:
+	chroot $(MNTDIR) useradd $(NUSRNAME) -G wheel
+	chroot $(MNTDIR) passwd $(NUSRNAME)
+
+laptop: metal wifi xorg audio post-install nuser
 
 archive:
 	tar -cvpjf void-fs.tar.bz2 \
diff --git a/config.mk b/config.mk
index 42fb519..f3c99ab 100644
--- a/config.mk
+++ b/config.mk
@@ -14,3 +14,5 @@ BVCLOC="en_US.UTF-8 UTF8"
 
 #hostname
 HSTNM=voidpad
+
+NUSRNAME=ed