diff --git a/doc/Changelog b/doc/Changelog
index 29cf20d14..0518233a3 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 15 October 2015: Wouter
 	- Fix segfault in the dns64 module in the formaterror error path.
+	- Fix sldns_wire2str_rdata_scan for malformed RRs.
 
 14 October 2015: Wouter
 	- ANY responses include DNAME records if present, as per Evan Hunt's
diff --git a/sldns/wire2str.c b/sldns/wire2str.c
index cec3bc7b0..5cbd78eed 100644
--- a/sldns/wire2str.c
+++ b/sldns/wire2str.c
@@ -697,6 +697,9 @@ int sldns_wire2str_rdata_scan(uint8_t** d, size_t* dlen, char** s,
 		}
 		w += n;
 	}
+	if(*dlen != 0) {
+		goto failed;
+	}
 	return w;
 }