diff --git a/src/detect-dns-query.c b/src/detect-dns-query.c
index ee49592872..0994546f5a 100644
--- a/src/detect-dns-query.c
+++ b/src/detect-dns-query.c
@@ -54,6 +54,7 @@
 #include "app-layer.h"
 #include "app-layer-dns-common.h"
 #include "detect-dns-query.h"
+#include "detect-engine-dns.h"
 
 #include "util-unittest-helper.h"
 
@@ -61,7 +62,7 @@ static int DetectDnsQuerySetup (DetectEngineCtx *, Signature *, char *);
 static void DetectDnsQueryRegisterTests(void);
 
 /**
- * \brief Registration function for keyword: http_uri
+ * \brief Registration function for keyword: dns_query
  */
 void DetectDnsQueryRegister (void)
 {
@@ -75,6 +76,11 @@ void DetectDnsQueryRegister (void)
 
     sigmatch_table[DETECT_AL_DNS_QUERY].flags |= SIGMATCH_NOOPT;
     sigmatch_table[DETECT_AL_DNS_QUERY].flags |= SIGMATCH_PAYLOAD;
+
+    DetectMpmAppLayerRegister("dns_query", SIG_FLAG_TOSERVER,
+            DETECT_SM_LIST_DNSQUERYNAME_MATCH,
+            PrefilterTxDnsQueryRegister);
+
 }
 
 
diff --git a/src/detect-engine-mpm.c b/src/detect-engine-mpm.c
index ee114cb933..424260503f 100644
--- a/src/detect-engine-mpm.c
+++ b/src/detect-engine-mpm.c
@@ -97,9 +97,6 @@ typedef struct AppLayerMpms_ {
 } AppLayerMpms;
 
 AppLayerMpms app_mpms[] = {
-    { "dns_query", 0, SIG_FLAG_TOSERVER, DETECT_SM_LIST_DNSQUERYNAME_MATCH,
-        PrefilterTxDnsQueryRegister, 0},
-
     { "tls_sni", 0, SIG_FLAG_TOSERVER, DETECT_SM_LIST_TLSSNI_MATCH,
         PrefilterTxTlsSniRegister, 0},
     { "tls_cert_issuer", 0, SIG_FLAG_TOCLIENT, DETECT_SM_LIST_TLSISSUER_MATCH,