diff --git a/doc/Changelog b/doc/Changelog
index 69e51130b..29c889e78 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+30 June 2009: Wouter
+	- more lenient truncation checks.
+
 29 June 2009: Wouter
 	- ldns trunk r2959 imported as tarball, because of solaris cc compile
 	  support for c99.  r2960 for better configure.
diff --git a/validator/validator.c b/validator/validator.c
index 5af4ca5a9..ebd492054 100644
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -1490,7 +1490,8 @@ processValidate(struct module_qstate* qstate, struct val_qstate* vq,
 		/* workaround bad recursor out there that truncates (even
 		 * with EDNS4k) to 512 by removing RRSIG from auth section
 		 * for positive replies*/
-		if(subtype == VAL_CLASS_POSITIVE &&
+		if((subtype == VAL_CLASS_POSITIVE || subtype == VAL_CLASS_ANY
+			|| subtype == VAL_CLASS_CNAME) &&
 			detect_wrongly_truncated(vq->orig_msg->rep)) {
 			/* truncate the message some more */
 			vq->orig_msg->rep->ns_numrrsets = 0;