diff --git a/typo3/file_upload.php b/typo3/file_upload.php
index 88ed183163712ac79d2c9471f1fa2f63a1268313..2356e2daf4809bc8ac385bcc4a2acc5568b26ab5 100644
--- a/typo3/file_upload.php
+++ b/typo3/file_upload.php
@@ -19,6 +19,10 @@
  */
 require __DIR__ . '/init.php';
 
+\TYPO3\CMS\Core\Utility\GeneralUtility::deprecationLog(
+	'Uploading a file is moved to an own module. Please use BackendUtility::getModuleUrl(\'file_upload\') to link to this script. This script will be removed.'
+);
+
 $fileUploadController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\File\\FileUploadController');
 $fileUploadController->main();
-$fileUploadController->printContent();
+$fileUploadController->printContent();
\ No newline at end of file
diff --git a/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php b/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
index 2f1ba41ac95dc988553617ba4103914a63721e6b..5ab72d0eb93afa25071cb2859272ef56e48d32ef 100644
--- a/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
+++ b/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
@@ -969,7 +969,7 @@ class ClickMenu {
 	 * @todo Define visibility
 	 */
 	public function FILE_upload($path) {
-		$script = 'file_upload.php';
+		$script = 'file_upload';
 		$type = 'upload';
 		$image = 'upload.gif';
 		return $this->FILE_launch($path, $script, $type, $image, TRUE);
diff --git a/typo3/sysext/backend/Modules/File/Upload/conf.php b/typo3/sysext/backend/Modules/File/Upload/conf.php
new file mode 100644
index 0000000000000000000000000000000000000000..5be50e98698eb5a78cb268194d46f5482b48de06
--- /dev/null
+++ b/typo3/sysext/backend/Modules/File/Upload/conf.php
@@ -0,0 +1,5 @@
+<?php
+//required for mod.php
+$MCONF['name'] = 'file_upload';
+$MCONF['script'] = '_DISPATCH';
+$MCONF['access'] = '';
\ No newline at end of file
diff --git a/typo3/sysext/backend/Modules/File/Upload/index.php b/typo3/sysext/backend/Modules/File/Upload/index.php
new file mode 100644
index 0000000000000000000000000000000000000000..2966a55128d4e697c674a8f4ac2c8cea033dee46
--- /dev/null
+++ b/typo3/sysext/backend/Modules/File/Upload/index.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+$fileUploadController = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Controller\\File\\FileUploadController');
+$fileUploadController->main();
+$fileUploadController->printContent();
\ No newline at end of file
diff --git a/typo3/sysext/backend/ext_tables.php b/typo3/sysext/backend/ext_tables.php
index 86dd48c1b8e0e2479dbf653743c876fe3d347c7d..2405ff28a4f678e546986ed82f9c78ef89f4bab2 100644
--- a/typo3/sysext/backend/ext_tables.php
+++ b/typo3/sysext/backend/ext_tables.php
@@ -26,6 +26,12 @@ if (TYPO3_MODE === 'BE') {
 		\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'Modules/File/Rename/'
 	);
 
+	// Register file_rename
+	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModulePath(
+		'file_upload',
+		\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'Modules/File/Upload/'
+	);
+
 	// Register edit wizard
 	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModulePath(
 		'wizard_edit',
diff --git a/typo3/sysext/filelist/Classes/Controller/FileListController.php b/typo3/sysext/filelist/Classes/Controller/FileListController.php
index f624578e762893df2a5f05feb837f507037ba13b..a1edbd5919cb7ec5acbac5066f95325d4054e77d 100644
--- a/typo3/sysext/filelist/Classes/Controller/FileListController.php
+++ b/typo3/sysext/filelist/Classes/Controller/FileListController.php
@@ -456,7 +456,14 @@ class FileListController {
 		$buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'filelist_module', $GLOBALS['BACK_PATH'], '', TRUE);
 		// Upload button (only if upload to this directory is allowed)
 		if ($this->folderObject && $this->folderObject->getStorage()->checkUserActionPermission('add', 'File') && $this->folderObject->checkActionPermission('write')) {
-			$buttons['upload'] = '<a href="' . $GLOBALS['BACK_PATH'] . 'file_upload.php?target=' . rawurlencode($this->folderObject->getCombinedIdentifier()) . '&amp;returnUrl=' . rawurlencode($this->filelist->listURL()) . '" id="button-upload" title="' . $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:cm.upload', TRUE)) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-edit-upload') . '</a>';
+			$buttons['upload'] = '<a href="' . htmlspecialchars($GLOBALS['BACK_PATH']
+				. BackendUtility::getModuleUrl(
+					'file_upload',
+					array(
+						'target' => $this->folderObject->getCombinedIdentifier(),
+						'returnUrl' => $this->filelist->listURL(),
+					)
+				)) . '" id="button-upload" title="' . $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:cm.upload', TRUE)) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-edit-upload') . '</a>';
 		}
 		// New folder button
 		if ($this->folderObject && $this->folderObject->checkActionPermission('write')
@@ -474,4 +481,4 @@ class FileListController {
 		return $buttons;
 	}
 
-}
+}
\ No newline at end of file