diff --git a/daemon/remote.c b/daemon/remote.c
index d82c1b4d8..a811e7168 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -247,6 +247,7 @@ add_open(const char* ip, int nr, struct listen_port** list, int noproto_is_err)
 			""
 #endif
 			);
+		return 0;
 	}
 
 	/* open fd */
diff --git a/doc/Changelog b/doc/Changelog
index d51b7328c..8553f86ec 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+5 January 2009: Wouter
+	- fixup getaddrinfo failure handling for remote control port.
+
 18 December 2008: Wouter
 	- fixed bug reported by Duane Wessels: error in DLV lookup, would make
 	  some zones that had correct DLV keys as insecure.