diff --git a/src/etc/group b/src/etc/group
index 486b90e8..60133209 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -77,6 +77,7 @@ _tftp_proxy:*:108:
 _ftp_proxy:*:109:
 _sndiop:*:110:
 _syspatch:*:112:
+_slaacd:*:115:
 dialer:*:117:
 nogroup:*:32766:
 nobody:*:32767:
diff --git a/src/etc/mail/aliases b/src/etc/mail/aliases
index d01ef71a..c1ac04b5 100644
--- a/src/etc/mail/aliases
+++ b/src/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.63 2017/01/19 06:48:50 ajacoutot Exp $
+#	$OpenBSD: aliases,v 1.64 2017/03/18 21:18:01 florian 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.
@@ -78,6 +78,7 @@ _tftp_proxy: /dev/null
 _ftp_proxy: /dev/null
 _sndiop: /dev/null
 _syspatch: /dev/null
+_slaacd: /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 e56895c6..e3106903 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -60,4 +60,5 @@ _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
 _syspatch:*:112:112::0:0:syspatch unprivileged user:/var/empty:/sbin/nologin
+_slaacd:*:115:115::0:0:SLAAC Daemon:/var/empty:/sbin/nologin
 nobody:*:32767:32767::0:0:Unprivileged user:/nonexistent:/sbin/nologin