diff --git a/src/etc/Makefile b/src/etc/Makefile
index f46dd1f4..2c5a6e59 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.454 2017/04/14 21:37:15 espie Exp $
+#	$OpenBSD: Makefile,v 1.455 2017/05/29 10:24:06 florian Exp $
 
 .include <bsd.own.mk>
 
@@ -55,7 +55,7 @@ RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dhcrelay6 dvmrpd \
 	iked inetd isakmpd iscsid ldapd ldattach ldomd ldpd lockd \
 	lpd mopd mountd mrouted nfsd npppd nsd ntpd ospf6d ospfd \
 	pflogd portmap radiusd rarpd rbootd rebound relayd ripd route6d \
-	rtadvd sasyncd sensorsd slowcgi smtpd sndiod snmpd spamd \
+	rtadvd sasyncd sensorsd slowcgi slaacd smtpd sndiod snmpd spamd \
 	spamlogd sshd statd switchd syslogd tftpd tftpproxy unbound \
 	vmd watchdogd wsmoused xenodm ypbind ypldap ypserv
 
diff --git a/src/etc/rc b/src/etc/rc
index ae73f2ff..aa75b505 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.496 2017/05/29 09:44:01 deraadt Exp $
+#	$OpenBSD: rc,v 1.497 2017/05/29 10:24:06 florian Exp $
 
 # System startup script run by init on autoboot or after single-user.
 # Output and error are redirected to console by init, and the console is the
@@ -432,7 +432,7 @@ dmesg >/var/run/dmesg.boot
 make_keys
 
 echo -n 'starting early daemons:'
-start_daemon syslogd ldattach pflogd nsd rebound unbound ntpd
+start_daemon syslogd ldattach pflogd slaacd nsd rebound unbound ntpd
 start_daemon iscsid isakmpd iked sasyncd ldapd npppd
 echo '.'
 
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 9048478b..6555d769 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.conf,v 1.213 2017/02/26 16:51:18 matthieu Exp $
+#	$OpenBSD: rc.conf,v 1.214 2017/05/29 10:24:06 florian Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -57,6 +57,7 @@ rtadvd_flags=NO		# for normal use: list of interfaces
 			# be sure to set net.inet6.ip6.forwarding=1
 sasyncd_flags=NO
 sensorsd_flags=NO
+slaacd_flags=NO
 slowcgi_flags=NO
 smtpd_flags=
 sndiod_flags=
diff --git a/src/etc/rc.d/slaacd b/src/etc/rc.d/slaacd
new file mode 100644
index 00000000..7790863b
--- /dev/null
+++ b/src/etc/rc.d/slaacd
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $OpenBSD: slaacd,v 1.1 2017/05/29 10:24:06 florian Exp $
+
+daemon="/usr/sbin/slaacd"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1