diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index fed173155..9a4f845df 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -252,6 +252,11 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 	
 	$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
+	if($settings->_overrideMimeType) {
+		$finfo = finfo_open(FILEINFO_MIME_TYPE);
+		$userfiletype = finfo_file($finfo, $userfiletmp);
+	}
+
 	if ((count($_FILES["userfile"]["tmp_name"])==1)&&($_POST["name"]!=""))
 		$name = $_POST["name"];
 	else $name = basename($userfilename);
diff --git a/op/op.AddFile.php b/op/op.AddFile.php
index f5f5c7a57..1da0ee0b3 100644
--- a/op/op.AddFile.php
+++ b/op/op.AddFile.php
@@ -59,6 +59,11 @@ $userfilename = $_FILES["userfile"]["name"];
 
 $fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
+if($settings->_overrideMimeType) {
+	$finfo = finfo_open(FILEINFO_MIME_TYPE);
+	$userfiletype = finfo_file($finfo, $userfiletmp);
+}
+
 $res = $document->addDocumentFile($name, $comment, $user, $userfiletmp, 
                                   basename($userfilename),$fileType, $userfiletype );
                                 
diff --git a/op/op.AddFile2.php b/op/op.AddFile2.php
index 8b0479a63..0780345a1 100644
--- a/op/op.AddFile2.php
+++ b/op/op.AddFile2.php
@@ -70,6 +70,11 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 
 		$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
+		if($settings->_overrideMimeType) {
+			$finfo = finfo_open(FILEINFO_MIME_TYPE);
+			$userfiletype = finfo_file($finfo, $userfiletmp);
+		}
+
 		$res = $document->addDocumentFile($name, $comment, $user, $userfiletmp, 
 																			basename($userfilename),$fileType, $userfiletype );
 																		
diff --git a/op/op.AddMultiDocument.php b/op/op.AddMultiDocument.php
index 6583a5fe7..ad7ff767e 100644
--- a/op/op.AddMultiDocument.php
+++ b/op/op.AddMultiDocument.php
@@ -174,6 +174,11 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 
 		$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
+		if($settings->_overrideMimeType) {
+			$finfo = finfo_open(FILEINFO_MIME_TYPE);
+			$userfiletype = finfo_file($finfo, $userfiletmp);
+		}
+
 		if(isset($_POST["name"]) && $_POST["name"] != "")
 			$name = $_POST["name"];
 		else
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index b90be7b4b..59851a7ba 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -474,6 +474,11 @@ switch($command) {
 
 				$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
+				if($settings->_overrideMimeType) {
+					$finfo = finfo_open(FILEINFO_MIME_TYPE);
+					$userfiletype = finfo_file($finfo, $userfiletmp);
+				}
+
 				if (!empty($_POST["name"]))
 					$name = $_POST["name"];
 				else
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index fbbbafd74..8d1244108 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -71,6 +71,11 @@ if ($_FILES['userfile']['error'] == 0) {
 	$userfiletmp = $_FILES["userfile"]["tmp_name"];
 	$userfiletype = $_FILES["userfile"]["type"];
 	$userfilename = $_FILES["userfile"]["name"];
+
+	if($settings->_overrideMimeType) {
+		$finfo = finfo_open(FILEINFO_MIME_TYPE);
+		$userfiletype = finfo_file($finfo, $userfiletmp);
+	}
 } elseif($settings->_dropFolderDir) {
 	if($_POST['dropfolderfileform1']) {
 		$fullfile = $settings->_dropFolderDir.'/'.$user->getLogin().'/'.$_POST["dropfolderfileform1"];
diff --git a/op/op.UpdateDocument2.php b/op/op.UpdateDocument2.php
index 44406c88d..7f98b4fec 100644
--- a/op/op.UpdateDocument2.php
+++ b/op/op.UpdateDocument2.php
@@ -73,6 +73,11 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 
 		$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
+		if($settings->_overrideMimeType) {
+			$finfo = finfo_open(FILEINFO_MIME_TYPE);
+			$userfiletype = finfo_file($finfo, $userfiletmp);
+		}
+
 		// Get the list of reviewers and approvers for this document.
 		$reviewers = array();
 		$approvers = array();