diff --git a/daemon/daemon.c b/daemon/daemon.c
index 0895c96f2..0494ddfbe 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -594,7 +594,7 @@ daemon_cleanup(struct daemon* daemon)
 	slabhash_clear(daemon->env->msg_cache);
 	local_zones_delete(daemon->local_zones);
 	daemon->local_zones = NULL;
-	/* key cache is cleared by module desetup during next daemon_init() */
+	/* key cache is cleared by module desetup during next daemon_fork() */
 	daemon_remote_clear(daemon->rc);
 	for(i=0; i<daemon->num; i++)
 		worker_delete(daemon->workers[i]);
diff --git a/doc/Changelog b/doc/Changelog
index e118fc67c..d89d8d467 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
 	  daemon_create_workers().
 	- Fix #802: workaround for function parameters that are "unused"
 	  without log_assert.
+	- Fix #803: confusing (and incorrect) code comment in daemon_cleanup().
 
 20 July 2016: Wouter
 	- Fix typo in unbound.conf.