diff --git a/changes/bug3369 b/changes/bug3369
new file mode 100644
index 0000000000000000000000000000000000000000..9c0d0e699aeade0bb2e5a63e2ecac8278108a4c1
--- /dev/null
+++ b/changes/bug3369
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - When asked about a DNS record type we don't support via a
+      client DNSPort, reply with NOTIMPL rather than an empty
+      reply. Patch by intrigeri. Fixes bug 3369; bugfix on 2.0.1-alpha.
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index 009ab5f34482e5cc30aa1bbfe9dadbf8d53f28f9..f2c473dfc5a2509c08a5d5524324f0c0bbb8d1a8 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -95,8 +95,8 @@ evdns_server_callback(struct evdns_server_request *req, void *_data)
   }
   if (!q) {
     log_info(LD_APP, "None of the questions we got were ones we're willing "
-             "to support. Sending NODATA.");
-    evdns_server_request_respond(req, DNS_ERR_NONE);
+             "to support. Sending NOTIMPL.");
+    evdns_server_request_respond(req, DNS_ERR_NOTIMPL);
     return;
   }
   if (q->type != EVDNS_TYPE_A) {