diff --git a/src/etc/Makefile b/src/etc/Makefile
index f0043223..896cf7ae 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.466 2019/01/08 07:14:10 florian Exp $
+#	$OpenBSD: Makefile,v 1.467 2019/01/26 10:59:07 florian Exp $
 
 .include <bsd.own.mk>
 
@@ -64,7 +64,7 @@ RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dhcrelay6 dvmrpd \
 	pflogd portmap rad radiusd rarpd rbootd rebound relayd ripd route6d \
 	sasyncd sensorsd slowcgi slaacd smtpd sndiod snmpd spamd \
 	spamlogd sshd statd switchd syslogd tftpd tftpproxy unbound \
-	vmd watchdogd wsmoused xenodm ypbind ypldap ypserv
+	unwind vmd watchdogd wsmoused xenodm ypbind ypldap ypserv
 
 MISETS=	base${OSrev}.tgz comp${OSrev}.tgz man${OSrev}.tgz game${OSrev}.tgz
 
diff --git a/src/etc/rc b/src/etc/rc
index a1df146d..6788879c 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.531 2019/01/24 05:14:02 ajacoutot Exp $
+#	$OpenBSD: rc,v 1.532 2019/01/26 10:59:07 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
@@ -474,7 +474,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 nsd rebound unwind unbound ntpd
 start_daemon iscsid isakmpd iked sasyncd ldapd npppd
 echo '.'
 
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 8e6b82bd..a513b757 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.conf,v 1.218 2018/07/23 11:54:49 florian Exp $
+#	$OpenBSD: rc.conf,v 1.219 2019/01/26 10:59:07 florian Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -69,6 +69,7 @@ syslogd_flags=		# add more flags, e.g. "-u -a /chroot/dev/log"
 tftpd_flags=NO
 tftpproxy_flags=NO
 unbound_flags=NO
+unwind_flags=NO
 vmd_flags=NO
 watchdogd_flags=NO
 wsmoused_flags=NO	# for enabling console mouse support (i386 alpha amd64)
diff --git a/src/etc/rc.d/unwind b/src/etc/rc.d/unwind
new file mode 100644
index 00000000..eea9ef5c
--- /dev/null
+++ b/src/etc/rc.d/unwind
@@ -0,0 +1,13 @@
+#!/bin/ksh
+#
+# $OpenBSD: unwind,v 1.1 2019/01/26 10:59:07 florian Exp $
+
+daemon="/sbin/unwind"
+
+. /etc/rc.d/rc.subr
+
+rc_pre() {
+	/usr/sbin/unbound-anchor -a /etc/unwind/trustanchor/root.key || true
+}
+
+rc_cmd $1