diff --git a/src/etc/group b/src/etc/group
index 259b3670..31eb2c3d 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -22,6 +22,9 @@ _sshagnt:*:34:
 _x11:*:35:
 utmp:*:45:
 _unbound:*:53:
+_dpb:*:54:
+_pbuild:*:55:
+_pfetch:*:56:
 _spamd:*:62:
 _radius:*:63:
 _token:*:64:
diff --git a/src/etc/mail/aliases b/src/etc/mail/aliases
index d3a37649..faa6c9b6 100644
--- a/src/etc/mail/aliases
+++ b/src/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.48 2015/04/27 13:48:06 nicm Exp $
+#	$OpenBSD: aliases,v 1.49 2015/07/17 23:22:39 sthen 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.
@@ -23,6 +23,7 @@ www:	root
 # Redirections for pseudo accounts that should not receive mail
 _bgpd: /dev/null
 _dhcp: /dev/null
+_dpb: /dev/null
 _dvmrpd: /dev/null
 _file: /dev/null
 _fingerd: /dev/null
@@ -39,6 +40,8 @@ _nsd: /dev/null
 _ntp: /dev/null
 _ospfd: /dev/null
 _ospf6d: /dev/null
+_pbuild: /dev/null
+_pfetch: /dev/null
 _pflogd: /dev/null
 _portmap: /dev/null
 _ppp: /dev/null
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index 466914a6..baf7842a 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -10,6 +10,9 @@ _rusersd:*:32:32::0:0:rpc.rusersd:/var/empty:/sbin/nologin
 _fingerd:*:33:33::0:0:fingerd:/var/empty:/sbin/nologin
 _x11:*:35:35::0:0:X Server:/var/empty:/sbin/nologin
 _unbound:*:53:53:unbound:0:0:Unbound Daemon:/var/unbound:/sbin/nologin
+_dpb:*:54:54::0:0:dpb privsep:/var/empty:/sbin/nologin
+_pbuild:*:55:55:pbuild:0:0:dpb build user:/nonexistent:/sbin/nologin
+_pfetch:*:56:56::0:0:dpb fetch user:/nonexistent:/sbin/nologin
 _spamd:*:62:62::0:0:Spam Daemon:/var/empty:/sbin/nologin
 uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/var/spool/uucppublic:/sbin/nologin
 www:*:67:67::0:0:HTTP Server:/var/www:/sbin/nologin