diff --git a/phpBB/config/mimetype_guessers.yml b/phpBB/config/mimetype_guessers.yml
new file mode 100644
index 0000000000..1b5cdee97d
--- /dev/null
+++ b/phpBB/config/mimetype_guessers.yml
@@ -0,0 +1,22 @@
+services:
+    mimetype.FileinfoMimeTypeGuesser:
+        class: Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser
+        tags:
+            - { name: mimetype.guessers }
+
+    mimetype.FileBinaryMimeTypeGuesser:
+        class: Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser
+        tags:
+            - { name: mimetype.guessers }
+
+    mimetype.guesser_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: mimetype.guessers }
+
+    mimetype.guesser:
+        class: phpbb\mimetype\guesser
+        arguments:
+            - @mimetype.guesser_collection
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index c6490a21d7..09fcb5dc8f 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -6,6 +6,7 @@ imports:
     - { resource: avatars.yml }
     - { resource: feed.yml }
     - { resource: auth_providers.yml }
+    - { resource: mimetype_guessers.yml }
 
 services:
     acl.permissions:
@@ -266,6 +267,7 @@ services:
             - @request
             - @user
             - @php_ini
+            - @mimetype.guesser
 
     request:
         class: phpbb\request\request
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php
index 6eb5adf864..29a4aff39b 100644
--- a/phpBB/phpbb/plupload/plupload.php
+++ b/phpBB/phpbb/plupload/plupload.php
@@ -49,6 +49,11 @@ class plupload
 	*/
 	protected $php_ini;
 
+	/**
+	* @var \phpbb\mimetype\guesser
+	*/
+	protected $mimetype_guesser;
+
 	/**
 	* Final destination for uploaded files, i.e. the "files" directory.
 	* @var string
@@ -69,16 +74,18 @@ class plupload
 	* @param \phpbb\request\request_interface $request
 	* @param \phpbb\user $user
 	* @param \phpbb\php\ini $php_ini
+	* @param \phpbb\mimetype\guesser $mimetype_guesser
 	*
 	* @return null
 	*/
-	public function __construct($phpbb_root_path, \phpbb\config\config $config, \phpbb\request\request_interface $request, \phpbb\user $user, \phpbb\php\ini $php_ini)
+	public function __construct($phpbb_root_path, \phpbb\config\config $config, \phpbb\request\request_interface $request, \phpbb\user $user, \phpbb\php\ini $php_ini, \phpbb\mimetype\guesser $mimetype_guesser)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->config = $config;
 		$this->request = $request;
 		$this->user = $user;
 		$this->php_ini = $php_ini;
+		$this->mimetype_guesser = $mimetype_guesser;
 
 		$this->upload_directory = $this->phpbb_root_path . $this->config['upload_path'];
 		$this->temporary_directory = $this->upload_directory . '/plupload';
@@ -128,7 +135,7 @@ class plupload
 				'tmp_name' => $file_path,
 				'name' => $this->request->variable('real_filename', ''),
 				'size' => filesize($file_path),
-				'type' => $file_info->getMimeType($file_path),
+				'type' => $this->mimetype_guesser->guess($file_path),
 			);
 		}
 		else