diff --git a/src/detect-engine.c b/src/detect-engine.c
index 193740f596..b0b1dc0f87 100644
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -45,7 +45,6 @@
 #include "detect-engine-tag.h"
 
 #include "detect-engine-uri.h"
-#include "detect-engine-hsbd.h"
 #include "detect-engine-hrhd.h"
 #include "detect-engine-hsmd.h"
 #include "detect-engine-hscd.h"
@@ -53,7 +52,6 @@
 #include "detect-engine-dns.h"
 #include "detect-engine-tls.h"
 #include "detect-engine-modbus.h"
-#include "detect-engine-filedata-smtp.h"
 #include "detect-engine-template.h"
 
 #include "detect-engine.h"
@@ -144,10 +142,6 @@ void DetectEngineRegisterAppInspectionEngines(void)
         { ALPROTO_MODBUS,
           DETECT_SM_LIST_MODBUS_MATCH,
           DetectEngineInspectModbus },
-        /* file_data smtp */
-        { ALPROTO_SMTP,
-          DETECT_SM_LIST_FILEDATA,
-          DetectEngineInspectSMTPFiledata },
         /* Template. */
         { ALPROTO_TEMPLATE,
           DETECT_SM_LIST_TEMPLATE_BUFFER_MATCH,
@@ -155,9 +149,6 @@ void DetectEngineRegisterAppInspectionEngines(void)
     };
 
     struct tmp_t data_toclient[] = {
-        { ALPROTO_HTTP,
-          DETECT_SM_LIST_FILEDATA,
-          DetectEngineInspectHttpServerBody },
         { ALPROTO_HTTP,
           DETECT_SM_LIST_FILEMATCH,
           DetectFileInspectHttp },
diff --git a/src/detect-file-data.c b/src/detect-file-data.c
index 981a2d5f10..ac518362d3 100644
--- a/src/detect-file-data.c
+++ b/src/detect-file-data.c
@@ -69,6 +69,13 @@ void DetectFiledataRegister(void)
     DetectMpmAppLayerRegister("file_data", SIG_FLAG_TOCLIENT,
             DETECT_SM_LIST_FILEDATA, 2,
             PrefilterTxHttpResponseBodyRegister);
+
+    DetectAppLayerInspectEngineRegister(ALPROTO_HTTP, SIG_FLAG_TOCLIENT,
+            DETECT_SM_LIST_FILEDATA,
+            DetectEngineInspectHttpServerBody);
+    DetectAppLayerInspectEngineRegister(ALPROTO_SMTP, SIG_FLAG_TOSERVER,
+            DETECT_SM_LIST_FILEDATA,
+            DetectEngineInspectSMTPFiledata);
 }
 
 /**