diff --git a/CHANGES b/CHANGES
index f4b7e43a7e..0c7235bd47 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.1-895 | 2013-07-29 14:07:35 -0700
+
+  * Adding a test for a DNSKEY RR. (Robin Sommer)
+
 2.1-894 | 2013-07-29 16:44:41 -0400
 
   * Updates for the Intel Framework. (Seth Hall)
diff --git a/VERSION b/VERSION
index 3131a2159f..9e4a84ae0a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1-894
+2.1-895
diff --git a/testing/btest/Baseline/scripts.base.protocols.dns.dns-key/dns.log b/testing/btest/Baseline/scripts.base.protocols.dns.dns-key/dns.log
new file mode 100644
index 0000000000..722d2c3912
--- /dev/null
+++ b/testing/btest/Baseline/scripts.base.protocols.dns.dns-key/dns.log
@@ -0,0 +1,10 @@
+#separator \x09
+#set_separator	,
+#empty_field	(empty)
+#unset_field	-
+#path	dns
+#open	2013-07-25-20-29-44
+#fields	ts	uid	id.orig_h	id.orig_p	id.resp_h	id.resp_p	proto	trans_id	query	qclass	qclass_name	qtype	qtype_name	rcode	rcode_name	AA	TC	RD	RA	Z	answers	TTLs	rejected
+#types	time	string	addr	port	addr	port	enum	count	string	count	string	count	string	count	string	bool	bool	bool	bool	count	vector[string]	vector[interval]	bool
+1359565680.761790	UWkUyAuUGXf	192.168.6.10	53209	192.168.129.36	53	udp	41477	paypal.com	1	C_INTERNET	48	DNSKEY	0	NOERROR	F	F	T	F	1	-	-	F
+#close	2013-07-25-20-29-44
diff --git a/testing/btest/Traces/dns-dnskey.trace b/testing/btest/Traces/dns-dnskey.trace
new file mode 100644
index 0000000000..c7a6448e79
Binary files /dev/null and b/testing/btest/Traces/dns-dnskey.trace differ
diff --git a/testing/btest/scripts/base/protocols/dns/dns-key.bro b/testing/btest/scripts/base/protocols/dns/dns-key.bro
new file mode 100644
index 0000000000..c51788c605
--- /dev/null
+++ b/testing/btest/scripts/base/protocols/dns/dns-key.bro
@@ -0,0 +1,4 @@
+# Making sure DNSKEY gets logged as such.
+#
+# @TEST-EXEC: bro -r $TRACES/dns-dnskey.trace
+# @TEST-EXEC: btest-diff dns.log