diff --git a/doc/Changelog b/doc/Changelog
index 2acefd24d..5486f13dc 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+1 June 2010: Wouter
+	- Ignore Z flag in incoming messages too.
+
 31 May 2010: Wouter
 	- Fix AD flag handling, it could in some cases mistakenly copy the AD 
 	  flag from upstream servers.
diff --git a/iterator/iter_scrub.c b/iterator/iter_scrub.c
index 2a5e5c9a4..607d0a0d7 100644
--- a/iterator/iter_scrub.c
+++ b/iterator/iter_scrub.c
@@ -717,7 +717,7 @@ scrub_message(ldns_buffer* pkt, struct msg_parse* msg,
 		return 0;
 	if( !(msg->flags&BIT_QR) )
 		return 0;
-	msg->flags &= ~(BIT_AD); /* force AD bit to be turned off */
+	msg->flags &= ~(BIT_AD|BIT_Z); /* force off bit AD and Z */
 	
 	/* make sure that a query is echoed back when NOERROR or NXDOMAIN */
 	/* this is not required for basic operation but is a forgery