diff --git a/dns64/dns64.c b/dns64/dns64.c
index 2f2d1255d..7889d72e2 100644
--- a/dns64/dns64.c
+++ b/dns64/dns64.c
@@ -792,6 +792,10 @@ dns64_inform_super(struct module_qstate* qstate, int id,
 					qstate->return_msg->rep))
 		return;
 
+	/* Use return code from A query in response to client. */
+	if (super->return_rcode != LDNS_RCODE_NOERROR)
+		super->return_rcode = qstate->return_rcode;
+
 	/* Generate a response suitable for the original query. */
 	if (qstate->qinfo.qtype == LDNS_RR_TYPE_A) {
 		dns64_adjust_a(id, super, qstate);
diff --git a/doc/Changelog b/doc/Changelog
index 762d6049a..923d6b1ed 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 
 5 October 2017: Ralph 
 	- Set trust-anchor-signaling default to yes
+	- Use RCODE from A query on DNS64 synthesized answer.
 
 2 October 2017: Wouter
 	- Fix param unused warning for windows exportsymbol compile.