diff --git a/src/Makefile.am b/src/Makefile.am
index 48d8948038..938c6acfa4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -214,7 +214,6 @@ log-httplog.c log-httplog.h \
 log-pcap.c log-pcap.h \
 log-tcp-data.c log-tcp-data.h \
 log-tlslog.c log-tlslog.h \
-mime-decode.c mime-decode.h \
 output.c output.h \
 output-file.c output-file.h \
 output-filedata.c output-filedata.h \
@@ -308,6 +307,7 @@ util-debug-filters.c util-debug-filters.h \
 util-decode-asn1.c util-decode-asn1.h \
 util-decode-der.c util-decode-der.h \
 util-decode-der-get.c util-decode-der-get.h \
+util-decode-mime.c util-decode-mime.h \
 util-device.c util-device.h \
 util-enum.c util-enum.h \
 util-error.c util-error.h \
diff --git a/src/app-layer-smtp.h b/src/app-layer-smtp.h
index 94d8eb8404..cf11e7d02c 100644
--- a/src/app-layer-smtp.h
+++ b/src/app-layer-smtp.h
@@ -25,7 +25,7 @@
 #define __APP_LAYER_SMTP_H__
 
 #include "decode-events.h"
-#include "mime-decode.h"
+#include "util-decode-mime.h"
 
 enum {
     SMTP_DECODER_EVENT_INVALID_REPLY,
diff --git a/src/log-file.c b/src/log-file.c
index 92b066df54..562f6ee0d6 100644
--- a/src/log-file.c
+++ b/src/log-file.c
@@ -56,7 +56,7 @@
 
 #include "app-layer-htp.h"
 #include "app-layer-smtp.h"
-#include "mime-decode.h"
+#include "util-decode-mime.h"
 #include "util-memcmp.h"
 #include "stream-tcp-reassemble.h"
 
diff --git a/src/log-filestore.c b/src/log-filestore.c
index 109dabbbd1..5fb19a8411 100644
--- a/src/log-filestore.c
+++ b/src/log-filestore.c
@@ -54,7 +54,7 @@
 
 #include "app-layer-htp.h"
 #include "app-layer-smtp.h"
-#include "mime-decode.h"
+#include "util-decode-mime.h"
 #include "util-memcmp.h"
 #include "stream-tcp-reassemble.h"
 
diff --git a/src/suricata.c b/src/suricata.c
index 853904f3a3..d0c084a76c 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -152,7 +152,7 @@
 
 #include "util-coredump-config.h"
 
-#include "mime-decode.h"
+#include "util-decode-mime.h"
 
 #include "defrag.h"
 
diff --git a/src/mime-decode.c b/src/util-decode-mime.c
similarity index 99%
rename from src/mime-decode.c
rename to src/util-decode-mime.c
index 31d4bcb0ac..4f43eda857 100644
--- a/src/mime-decode.c
+++ b/src/util-decode-mime.c
@@ -24,7 +24,7 @@
 
 #include "suricata-common.h"
 
-#include "mime-decode.h"
+#include "util-decode-mime.h"
 
 #include "util-spm-bs.h"
 #include "util-unittest.h"
diff --git a/src/mime-decode.h b/src/util-decode-mime.h
similarity index 100%
rename from src/mime-decode.h
rename to src/util-decode-mime.h