diff --git a/doc/Changelog b/doc/Changelog
index 2ab77d5fb..c1847b842 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 13 January 2009: Wouter
 	- fixed bug in lameness marking, removed printouts.
+	- find NS rrset more cleanly for qtype NS.
 
 12 January 2009: Wouter
 	- fixed bug in infrastructure lameness cache, did not lowercase
diff --git a/iterator/iterator.c b/iterator/iterator.c
index 522bed7cc..5f90310c8 100644
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -1424,6 +1424,8 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 			iq->response->rep, iq->response->rep->an_numrrsets,
 			iq->response->rep->an_numrrsets 
 			+ iq->response->rep->ns_numrrsets);
+		if(!ns) find_NS(iq->response->rep, 0, 
+				iq->response->rep->an_numrrsets);
 		if(!ns || !dname_strict_subdomain_c(ns->rk.dname, iq->dp->name) 
 			|| !dname_subdomain_c(iq->qchase.qname, ns->rk.dname)){
 			verbose(VERB_ALGO, "bad referral, throwaway");