diff --git a/doc/Changelog b/doc/Changelog
index 26394c237..72d1e4914 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+20 September 2011: Wouter
+	- Fix classification of NS set in answer section, where there is a
+	  parent-child server, and the answer has the AA flag for dir.slb.com.
+	  Thanks to Amanda Constant from Secure64.
+
 16 September 2011: Wouter
 	- fix bug #408: accept patch from Steve Snyder that comments out
 	  unused functions in lookup3.c.
diff --git a/iterator/iter_resptype.c b/iterator/iter_resptype.c
index 8ff7e3e6f..1b62a9045 100644
--- a/iterator/iter_resptype.c
+++ b/iterator/iter_resptype.c
@@ -163,6 +163,8 @@ response_type_from_server(int rdset,
 				ntohs(s->rk.rrset_class) == request->qclass &&
 				dname_strict_subdomain_c(s->rk.dname, 
 				origzone)) {
+				if((msg->rep->flags&BIT_AA))
+					return RESPONSE_TYPE_ANSWER;
 				return RESPONSE_TYPE_REFERRAL;
 			}