diff --git a/src/file_analysis/Manager.cc b/src/file_analysis/Manager.cc
index 35373a6de0..ad75b2a3cb 100644
--- a/src/file_analysis/Manager.cc
+++ b/src/file_analysis/Manager.cc
@@ -149,7 +149,7 @@ string Manager::DataIn(const u_char* data, uint64_t len, const analyzer::Tag& ta
 	}
 
 void Manager::DataIn(const u_char* data, uint64_t len, const string& file_id,
-                     const string& source)
+                     const string& source, const string& mime_type)
 	{
 	File* file = GetFile(file_id, nullptr, analyzer::Tag::Error, false, false,
 	                     source.c_str());
@@ -157,12 +157,34 @@ void Manager::DataIn(const u_char* data, uint64_t len, const string& file_id,
 	if ( ! file )
 		return;
 
+	if ( ! mime_type.empty() )
+		file->SetMime(mime_type);
+
 	file->DataIn(data, len);
 
 	if ( file->IsComplete() )
 		RemoveFile(file->GetID());
 	}
 
+void Manager::DataIn(const u_char* data, uint64_t len, uint64_t offset,
+					 const string& file_id, const string& source,
+					 const string& mime_type)
+	{
+	File* file = GetFile(file_id, nullptr, analyzer::Tag::Error, false, false,
+	                     source.c_str());
+
+	if ( ! file )
+		return;
+
+	if ( ! mime_type.empty() )
+		file->SetMime(mime_type);
+
+	file->DataIn(data, len, offset);
+
+	if ( file->IsComplete() )
+		RemoveFile(file->GetID());
+	}
+
 void Manager::EndOfFile(const analyzer::Tag& tag, Connection* conn)
 	{
 	EndOfFile(tag, conn, true);
diff --git a/src/file_analysis/Manager.h b/src/file_analysis/Manager.h
index c6cf1f8b24..7a538eff6b 100644
--- a/src/file_analysis/Manager.h
+++ b/src/file_analysis/Manager.h
@@ -150,9 +150,34 @@ public:
 	 * @param source uniquely identifies the file and should also describe
 	 *        in human-readable form where the file input is coming from (e.g.
 	 *        a local file path).
+	 * @param mime_type may be set to the mime type of the file, if already known due
+	 *        to the protocol. This is, e.g., the case in TLS connections where X.509
+	 *        certificates are passed as files; here the type of the file is set by
+	 *        the protocol. If this parameter is give, mime type detection will be
+	 *        disabled.
+	 *        This parameter is only used for the first bit of data for each file.
 	 */
 	void DataIn(const u_char* data, uint64_t len, const std::string& file_id,
-	            const std::string& source);
+	            const std::string& source, const std::string& mime_type = "");
+
+	/**
+	 * Pass in sequential file data from external source (e.g. input framework).
+	 * @param data pointer to start of a chunk of file data.
+	 * @param len number of bytes in the data chunk.
+	 * @param offset number of bytes from start of file that data chunk occurs.
+	 * @param file_id an identifier for the file (usually a hash of \a source).
+	 * @param source uniquely identifies the file and should also describe
+	 *        in human-readable form where the file input is coming from (e.g.
+	 *        a local file path).
+	 * @param mime_type may be set to the mime type of the file, if already known due
+	 *        to the protocol. This is, e.g., the case in TLS connections where X.509
+	 *        certificates are passed as files; here the type of the file is set by
+	 *        the protocol. If this parameter is give, mime type detection will be
+	 *        disabled.
+	 *        This parameter is only used for the first bit of data for each file.
+	 */
+	void DataIn(const u_char* data, uint64_t len, uint64_t offset, const std::string& file_id,
+	            const std::string& source, const std::string& mime_type = "");
 
 	/**
 	 * Signal the end of file data regardless of which direction it is being