diff --git a/typo3/sysext/core/Classes/Page/PageRenderer.php b/typo3/sysext/core/Classes/Page/PageRenderer.php
index 691526ff493b33b310c85f20dcc4b9ffd1825d70..3de0899b64fb6dd72b0127b8a2990e252ce0bb94 100644
--- a/typo3/sysext/core/Classes/Page/PageRenderer.php
+++ b/typo3/sysext/core/Classes/Page/PageRenderer.php
@@ -1594,7 +1594,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
 			// first, load all paths for the namespaces, and configure contrib libs.
 			$this->requireJsConfig['paths'] = array(
 				'jquery-ui' => $this->backPath . 'sysext/core/Resources/Public/JavaScript/Contrib/jquery-ui',
-				'jquery' => $this->backPath . 'contrib/jquery',
+				'jquery' => $this->backPath . rtrim($this->jQueryPath, '/'),
 				'datatables' => $this->backPath . 'sysext/core/Resources/Public/JavaScript/Contrib/jquery.dataTables',
 				'nprogress' => $this->backPath . 'sysext/core/Resources/Public/JavaScript/Contrib/nprogress',
 				'moment' => $this->backPath . 'sysext/core/Resources/Public/JavaScript/Contrib/moment',
diff --git a/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php b/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
index 92c6910063bdc889633a2debc8858551fc92ce14..305ca0adb3f025e5555cc84bb0410b9569ba5e64 100644
--- a/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
+++ b/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
@@ -88,7 +88,7 @@ class PageRendererTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
 		$expectedScriptaculousSlider  = '<script src="sysext/core/Resources/Public/JavaScript/Contrib/scriptaculous/slider.js" type="text/javascript"></script>';
 
 		$subject->loadJquery();
-		$expectedJqueryRegExp = '#<script src="contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
+		$expectedJqueryRegExp = '#<script src="sysext/core/Resources/Public/JavaScript/Contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
 		$expectedJqueryStatement = 'var TYPO3 = TYPO3 || {}; TYPO3.jQuery = jQuery.noConflict(true);';
 
 		$subject->loadExtJS(TRUE, TRUE, 'jquery');
@@ -243,7 +243,7 @@ class PageRendererTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
 	public function loadJqueryRespectsGivenNamespace() {
 		$subject = new \TYPO3\CMS\Core\Page\PageRenderer();
 
-		$expectedRegExp = '#<script src="contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
+		$expectedRegExp = '#<script src="sysext/core/Resources/Public/JavaScript/Contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
 		$expectedStatement = 'var TYPO3 = TYPO3 || {}; TYPO3.MyNameSpace = jQuery.noConflict(true);';
 		$subject->loadJquery(NULL, NULL, 'MyNameSpace');
 		$out = $subject->render();
@@ -257,7 +257,7 @@ class PageRendererTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
 	public function loadJqueryWithDefaultNoConflictModeDoesNotSetNamespace() {
 		$subject = new \TYPO3\CMS\Core\Page\PageRenderer();
 
-		$expectedRegExp = '#<script src="contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
+		$expectedRegExp = '#<script src="sysext/core/Resources/Public/JavaScript/Contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
 		$expectedStatement = 'jQuery.noConflict();';
 		$subject->loadJquery(NULL, NULL, \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_NAMESPACE_DEFAULT_NOCONFLICT);
 		$out = $subject->render();
@@ -272,7 +272,7 @@ class PageRendererTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
 	public function loadJqueryWithNamespaceNoneDoesNotIncludeNoConflictHandling() {
 		$subject = new \TYPO3\CMS\Core\Page\PageRenderer();
 
-		$expectedRegExp = '#<script src="contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
+		$expectedRegExp = '#<script src="sysext/core/Resources/Public/JavaScript/Contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.min\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
 		$subject->loadJquery(NULL, NULL, \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_NAMESPACE_NONE);
 		$out = $subject->render();
 		$this->assertRegExp($expectedRegExp, $out);
@@ -285,7 +285,7 @@ class PageRendererTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
 	public function loadJqueryLoadsTheLatestJqueryVersionInNoConflictModeUncompressedInDebugMode() {
 		$subject = new \TYPO3\CMS\Core\Page\PageRenderer();
 
-		$expectedRegExp = '#<script src="contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
+		$expectedRegExp = '#<script src="sysext/core/Resources/Public/JavaScript/Contrib/jquery/jquery-' . \TYPO3\CMS\Core\Page\PageRenderer::JQUERY_VERSION_LATEST . '\\.(js|\\d+\\.js|js\\?\\d+)" type="text/javascript"></script>#';
 		$expectedStatement = 'var TYPO3 = TYPO3 || {}; TYPO3.jQuery = jQuery.noConflict(true);';
 		$subject->loadJquery();
 		$subject->enableDebugMode();
diff --git a/typo3/sysext/install/Resources/Private/Layouts/Step.html b/typo3/sysext/install/Resources/Private/Layouts/Step.html
index f50d79c57c10d2830c3050e6bb93488e7692a642..47c557ef2496c227d8103da75e3174bded83421d 100644
--- a/typo3/sysext/install/Resources/Private/Layouts/Step.html
+++ b/typo3/sysext/install/Resources/Private/Layouts/Step.html
@@ -1,10 +1,8 @@
-{namespace i=TYPO3\CMS\Install\ViewHelpers}
-
 <!DOCTYPE html>
-<html>
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:i="http://typo3.org/ns/TYPO3/CMS/Install/ViewHelpers">
 	<head>
 		<title>Installing TYPO3 CMS</title>
-		<script type="text/javascript" src="../../../contrib/jquery/jquery-1.11.2.min.js?{time}"></script>
+		<script type="text/javascript" src="../../core/Resources/Public/JavaScript/Contrib/jquery/jquery-1.11.2.min.js?{time}"></script>
 		<script type="text/javascript" src="../Resources/Public/Javascript/Install.js?{time}"></script>
 		<link rel="stylesheet" type="text/css" href="../Resources/Public/Stylesheets/Action/Step/General.css?{time}" />
 	</head>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Common/Headers.html b/typo3/sysext/install/Resources/Private/Partials/Action/Common/Headers.html
index 746b804c7a895b8c968d72b509296ef80d8bfe96..c378b2f14aeab856ef34e95395a1397b191cf0cf 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Common/Headers.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Common/Headers.html
@@ -2,5 +2,5 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <link rel="shortcut icon" href="../../../gfx/favicon.ico" />
 <link rel="stylesheet" type="text/css" href="../Resources/Public/Stylesheets/Action/Common/Install.css?{time}" />
-<script type="text/javascript" src="../../../contrib/jquery/jquery-1.11.2.min.js?{time}"></script>
-<script type="text/javascript" src="../Resources/Public/Javascript/Install.js?{time}"></script>
\ No newline at end of file
+<script type="text/javascript" src="../../core/Resources/Public/JavaScript/Contrib/jquery/jquery-1.11.2.min.js?{time}"></script>
+<script type="text/javascript" src="../Resources/Public/Javascript/Install.js?{time}"></script>