diff --git a/doc/Changelog b/doc/Changelog
index dd8f3d2f0..6b33330b5 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -11,6 +11,8 @@
 	  the packet got rcode NXDOMAIN into rcode NOERROR. (since the initial
 	  domain exists).
 	- nicer verbosity: 0 and 1 levels.
+	- lower nonRDquery chance of eliciting wrongly typed validation
+	  requiring message from the cache.
 
 27 November 2007: Wouter
 	- per suggestion in rfc2308, replaced default max-ttl value with 1 day.
diff --git a/validator/val_utils.c b/validator/val_utils.c
index 8947d665c..5f29ed9bf 100644
--- a/validator/val_utils.c
+++ b/validator/val_utils.c
@@ -65,7 +65,7 @@ val_classify_response(uint16_t query_flags, struct query_info* qinf,
 		return VAL_CLASS_NAMEERROR;
 
 	/* check for referral: nonRD query */
-	if(!(query_flags&BIT_RD))
+	if(!(query_flags&BIT_RD) && rep->an_numrrsets == 0)
 		return VAL_CLASS_REFERRAL;
 	
 	/* dump bad messages */