diff --git a/doc/Changelog b/doc/Changelog
index dde9f6683..315950379 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 2 May 2017: Wouter
 	- Added test for leak of stub information.
+	- Fix sldns wire2str printout of RR type CAA tags.
 
 1 May 2017: Wouter
 	- Fix #1259: "--disable-ecdsa" argument overwritten 
diff --git a/sldns/wire2str.c b/sldns/wire2str.c
index b2ca6192c..d3fe3e318 100644
--- a/sldns/wire2str.c
+++ b/sldns/wire2str.c
@@ -1639,10 +1639,10 @@ int sldns_wire2str_tag_scan(uint8_t** d, size_t* dl, char** s, size_t* sl)
 	if(*dl < 1+n)
 		return -1;
 	for(i=0; i<n; i++)
-		if(!isalnum((unsigned char)(*d)[i]))
+		if(!isalnum((unsigned char)(*d)[i+1]))
 			return -1;
 	for(i=0; i<n; i++)
-		w += sldns_str_print(s, sl, "%c", (char)(*d)[i]);
+		w += sldns_str_print(s, sl, "%c", (char)(*d)[i+1]);
 	(*d)+=n+1;
 	(*dl)-=(n+1);
 	return w;
diff --git a/testdata/test_ldnsrr.c5 b/testdata/test_ldnsrr.c5
index 6706aa392..d78068c6f 100644
--- a/testdata/test_ldnsrr.c5
+++ b/testdata/test_ldnsrr.c5
@@ -111,19 +111,19 @@ host1.blaat.nl.	3600	IN	L64	10 2001:0db8:1140:1000
 05686F73743105626C616174026E6C00006B000100000E100018000A0B6C36342D7375626E65743105626C616174026E6C00
 host1.blaat.nl.	3600	IN	LP	10 l64-subnet1.blaat.nl.
 03636161000101000100000E1000150005697373756563612E6578616D706C652E6E6574
-caa.	3600	IN	CAA	\# 21 0005697373756563612E6578616D706C652E6E6574
+caa.	3600	IN	CAA	0 issue "ca.example.net"
 03636161000101000100000E1000220005696F6465666D61696C746F3A7365637572697479406578616D706C652E636F6D
-caa.	3600	IN	CAA	\# 34 0005696F6465666D61696C746F3A7365637572697479406578616D706C652E636F6D
+caa.	3600	IN	CAA	0 iodef "mailto:security@example.com"
 03636161000101000100000E1000200005696F646566687474703A2F2F696F6465662E6578616D706C652E636F6D2F
-caa.	3600	IN	CAA	\# 32 0005696F646566687474703A2F2F696F6465662E6578616D706C652E636F6D2F
+caa.	3600	IN	CAA	0 iodef "http://iodef.example.com/"
 03636161000101000100000E1000250005697373756563612E6578616D706C652E6E65743B206163636F756E743D323330313233
-caa.	3600	IN	CAA	\# 37 0005697373756563612E6578616D706C652E6E65743B206163636F756E743D323330313233
+caa.	3600	IN	CAA	0 issue "ca.example.net; account=230123"
 03636161000101000100000E1000200005697373756563612E6578616D706C652E6E65743B20706F6C6963793D6576
-caa.	3600	IN	CAA	\# 32 0005697373756563612E6578616D706C652E6E65743B20706F6C6963793D6576
+caa.	3600	IN	CAA	0 issue "ca.example.net; policy=ev"
 03636161000101000100000E10000C8003746273556E6B6E6F776E
-caa.	3600	IN	CAA	\# 12 8003746273556E6B6E6F776E
+caa.	3600	IN	CAA	128 tbs "Unknown"
 03636161000101000100000E100046020461757468303E3039060A2B06010401D67902030106096086480165030402010420614829C81B958911F81164D40DCDBFD49D66CEB3B3442FF6C9C3A912F9497566020100
-caa.	3600	IN	CAA	\# 70 020461757468303E3039060A2B06010401D67902030106096086480165030402010420614829C81B958911F81164D40DCDBFD49D66CEB3B3442FF6C9C3A912F9497566020100
+caa.	3600	IN	CAA	2 auth "0>09\006\010+\006\001\004\001\214y\002\003\001\006	`\134H\001e\003\004\002\001\004 aH)\200\027\149\137\017\248\017d\212\013\205\191\212\157f\206\179\179D/\246\201\195\169\018\249Iuf\002\001\000"
 05657569343800006C000100000E10000600005E90012A
 eui48.	3600	IN	EUI48	00-00-5e-90-01-2a
 05657569363400006D000100000E10000800005EEF0000002A