diff --git a/src/etc/group b/src/etc/group
index c1a2c254..3a449f51 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -71,6 +71,7 @@ _eigrpd:*:106:
 _vmd:*:107:
 _tftp_proxy:*:108:
 _ftp_proxy:*:109:
+_sndiop:*:110:
 dialer:*:117:
 nogroup:*:32766:
 nobody:*:32767:
diff --git a/src/etc/mail/aliases b/src/etc/mail/aliases
index a79a6a7b..7e38630d 100644
--- a/src/etc/mail/aliases
+++ b/src/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.54 2015/12/01 07:31:29 deraadt Exp $
+#	$OpenBSD: aliases,v 1.55 2015/12/16 18:19:25 ratchov 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.
@@ -72,6 +72,7 @@ nobody:	/dev/null
 proxy:  /dev/null		# remove in 6.0
 _tftp_proxy: /dev/null
 _ftp_proxy: /dev/null
+_sndiop: /dev/null
 sshd:   /dev/null
 
 # Well-known aliases -- these should be filled in!
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index 939f09d4..5a7af628 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -54,4 +54,5 @@ _eigrpd:*:106:106::0:0:EIGRP Daemon:/var/empty:/sbin/nologin
 _vmd:*:107:107::0:0:VM Daemon:/var/empty:/sbin/nologin
 _tftp_proxy:*:108:108::0:0:tftp proxy daemon:/nonexistent:/sbin/nologin
 _ftp_proxy:*:109:109::0:0:ftp proxy daemon:/nonexistent:/sbin/nologin
+_sndiop:*:110:110::0:0:sndio privileged user:/var/empty:/sbin/nologin
 nobody:*:32767:32767::0:0:Unprivileged user:/nonexistent:/sbin/nologin