diff --git a/Makefile.in b/Makefile.in
index f53310b39..a0f9cc494 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -297,7 +297,7 @@ download_ldns:
 
 iana_update:
 	curl -o port-numbers.tmp http://www.iana.org/assignments/port-numbers
-	egrep -v "Unassigned|Reserved" port-numbers.tmp | awk '{ match($$0, "[0-9]+/udp"); if (RLENGTH > 0) print substr($$0, RSTART, RLENGTH - 4) ","}' | sort -nu > portslist.tmp
+	awk '/Unassigned|Reserved/ {next;} { match($$0, "[0-9]+/udp"); if (RLENGTH > 0) print substr($$0, RSTART, RLENGTH - 4) ","}' port-numbers.tmp | sort -nu > portslist.tmp
 	cat portslist.tmp > util/iana_ports.inc
 	rm -f port-numbers.tmp portslist.tmp
 
diff --git a/doc/Changelog b/doc/Changelog
index c05348cbf..a1bfc17a1 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,9 @@
+13 August 2008: Wouter
+	- bug #203: nicer do-auto log message when user sets incompatible
+	  options.
+	- bug #204: variable name ameliorated in log.c.
+	- bug #206: in iana_update, no egrep, but awk use.
+
 12 August 2008: Wouter
 	- finished adjusting testset to provide qtype NS answers.
 
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 3466337fb..5ea5faa81 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -605,7 +605,7 @@ listening_ports_open(struct config_file* cfg)
 		return NULL;
 	}
 	if(do_auto && (!do_ip4 || !do_ip6)) {
-		log_warn("interface_automatic option does not work when IP4 or IP6 is not enabled. Disabling option.");
+		log_warn("interface_automatic option does not work when either do-ip4 or do-ip6 is not enabled. Disabling option.");
 		do_auto = 0;
 	}
 	/* create ip4 and ip6 ports so that return addresses are nice. */
diff --git a/util/log.c b/util/log.c
index caa13d4a5..7b1e9d850 100644
--- a/util/log.c
+++ b/util/log.c
@@ -67,7 +67,7 @@ static ub_thread_key_t logkey;
 static const char* ident="unbound";
 #ifdef HAVE_SYSLOG_H
 /** are we using syslog(3) to log to */
-static int log_to_syslog = 0;
+static int logging_to_syslog = 0;
 #endif /* HAVE_SYSLOG_H */
 /** time to print in log, if NULL, use time(2) */
 static uint32_t* log_now = NULL;
@@ -82,7 +82,7 @@ log_init(const char* filename, int use_syslog, const char* chrootdir)
 	}
 	if(logfile 
 #ifdef HAVE_SYSLOG_H
-	|| log_to_syslog
+	|| logging_to_syslog
 #endif
 	)
 	verbose(VERB_QUERY, "switching log to %s", 
@@ -90,13 +90,13 @@ log_init(const char* filename, int use_syslog, const char* chrootdir)
 	if(logfile && logfile != stderr)
 		fclose(logfile);
 #ifdef HAVE_SYSLOG_H
-	if(log_to_syslog) {
+	if(logging_to_syslog) {
 		closelog();
-		log_to_syslog = 0;
+		logging_to_syslog = 0;
 	}
 	if(use_syslog) {
 		openlog(ident, 0, LOG_DAEMON);
-		log_to_syslog = 1;
+		logging_to_syslog = 1;
 		return;
 	}
 #endif /* HAVE_SYSLOG_H */
@@ -147,7 +147,7 @@ log_vmsg(int pri, const char* type,
 	(void)pri;
 	vsnprintf(message, sizeof(message), format, args);
 #ifdef HAVE_SYSLOG_H
-	if(log_to_syslog) {
+	if(logging_to_syslog) {
 		syslog(pri, "[%d:%x] %s: %s", 
 			(int)getpid(), tid?*tid:0, type, message);
 		return;