diff --git a/package/confd/confd.conf b/package/confd/confd.conf
index d8b829fcd..7c52d1119 100644
--- a/package/confd/confd.conf
+++ b/package/confd/confd.conf
@@ -27,5 +27,6 @@ service name:netopeer log \
 	[12345789] <pid/confd> netopeer2-server -F -t 60 \
 	-- NETCONF server
 
-# XXX: This is a hack, talk to Joachim
-task [12345789] resolvconf -u -- Update DNS configuration
+# Create initial /etc/resolv.conf after successful bootstrap
+task name:resolv :conf norestart if:<run/startup/success> \
+	[S] <pid/dnsmasq> resolvconf -u -- Update DNS configuration