diff --git a/src/etc/group b/src/etc/group
index 72d9edb0..4ff471de 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -11,6 +11,7 @@ users:*:10:
 auth:*:11:
 games:*:13:
 staff:*:20:root
+wobj:*:21:
 sshd:*:27:
 _portmap:*:28:
 _identd:*:29:
diff --git a/src/etc/mail/aliases b/src/etc/mail/aliases
index 0d03e65a..3d602f9d 100644
--- a/src/etc/mail/aliases
+++ b/src/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.60 2016/10/06 20:20:41 reyk Exp $
+#	$OpenBSD: aliases,v 1.61 2016/11/15 20:44:40 tb Exp $
 #
 #  Aliases in this file will NOT be expanded in the header from
 #  Mail, but WILL be visible over networks or from /usr/libexec/mail.local.
@@ -73,6 +73,7 @@ _vmd: /dev/null
 _x11:   /dev/null
 _ypldap: /dev/null
 bin:	/dev/null
+build:	/dev/null
 nobody:	/dev/null
 _tftp_proxy: /dev/null
 _ftp_proxy: /dev/null
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index 06e203f7..c3fb1ce3 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -2,6 +2,7 @@ root::0:0:daemon:0:0:Charlie &:/root:/bin/ksh
 daemon:*:1:1::0:0:The devil himself:/root:/sbin/nologin
 operator:*:2:5::0:0:System &:/operator:/sbin/nologin
 bin:*:3:7::0:0:Binaries Commands and Source:/:/sbin/nologin
+build:*:21:21::0:0:base and xenocara build:/var/empty:/bin/ksh
 sshd:*:27:27::0:0:sshd privsep:/var/empty:/sbin/nologin
 _portmap:*:28:28::0:0:portmap:/var/empty:/sbin/nologin
 _identd:*:29:29::0:0:identd:/var/empty:/sbin/nologin