diff --git a/doc/Changelog b/doc/Changelog
index 5e7930d63..a38cf4531 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 8 November 2011: Wouter
 	- can configure ssl service to one port number, and not on others.
 	- fixup windows compile with ssl support.
+	- Fix double free in unbound-host, reported by Steve Grubb.
 
 1 November 2011: Wouter
 	- dns over ssl support as a client, ssl-upstream yes turns it on.
diff --git a/smallapp/unbound-host.c b/smallapp/unbound-host.c
index 8b96c3576..095396749 100644
--- a/smallapp/unbound-host.c
+++ b/smallapp/unbound-host.c
@@ -255,9 +255,10 @@ print_rd(int t, char* data, size_t len)
 	ldns_rr_set_owner(rr, NULL);
 	status = ldns_wire2rdf(rr, rd, len+2, &pos);
 	if(status != LDNS_STATUS_OK) {
-	
 		free(rd);
+		ldns_rr_free(rr);
 		printf("error_printing_data");
+		return;
 	}
 	for(i=0; i<ldns_rr_rd_count(rr); i++) {
 		printf(" ");