diff --git a/build/build.xml b/build/build.xml
index 3c8d35fb86..79cbdf79e4 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -303,9 +303,25 @@
 
 	<target name="clean-vendor-dir">
 		<!-- Delete unrelated files from vendor/, see PHPBB3-12390 -->
+		<delete dir="${dir}/vendor/bantu/ini-get-wrapper/tests" />
+		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.gitignore" />
+		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.scrutinizer.yml" />
+		<delete file="${dir}/vendor/bantu/ini-get-wrapper/.travis.yml" />
+		<delete file="${dir}/vendor/bantu/ini-get-wrapper/phpunit.xml.dist" />
+		<delete file="${dir}/vendor/bantu/ini-get-wrapper/README.md" />
+
+		<delete dir="${dir}/vendor/google/recaptcha/examples" />
+		<delete dir="${dir}/vendor/google/recaptcha/tests" />
+		<delete file="${dir}/vendor/google/recaptcha/.gitignore" />
+		<delete file="${dir}/vendor/google/recaptcha/.travis.yml" />
+		<delete file="${dir}/vendor/google/recaptcha/CONTRIBUTING.md" />
+		<delete file="${dir}/vendor/google/recaptcha/phpunit.xml.dist" />
+		<delete file="${dir}/vendor/google/recaptcha/README.md" />
+
 		<delete dir="${dir}/vendor/lusitanian/oauth/examples" />
 		<delete dir="${dir}/vendor/lusitanian/oauth/tests" />
 		<delete file="${dir}/vendor/lusitanian/oauth/.gitignore" />
+		<delete file="${dir}/vendor/lusitanian/oauth/.scrutinizer.yml" />
 		<delete file="${dir}/vendor/lusitanian/oauth/.travis.yml" />
 		<delete file="${dir}/vendor/lusitanian/oauth/phpunit.xml.dist" />
 		<delete file="${dir}/vendor/lusitanian/oauth/README.md" />
@@ -391,12 +407,19 @@
 		<delete file="${dir}/vendor/symfony/routing/README.md" />
 		<delete file="${dir}/vendor/symfony/routing/phpunit.xml.dist" />
 
+		<delete dir="${dir}/vendor/symfony/twig-bridge/.git" />
+		<delete dir="${dir}/vendor/symfony/twig-bridge/Tests" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/.gitignore" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/README.md" />
+		<delete file="${dir}/vendor/symfony/twig-bridge/phpunit.xml.dist" />
+
 		<delete dir="${dir}/vendor/symfony/yaml/.git" />
-		<delete dir="${dir}/vendor/symfony/yaml/Symfony/Tests" />
-		<delete file="${dir}/vendor/symfony/yaml/Symfony/.gitignore" />
-		<delete file="${dir}/vendor/symfony/yaml/Symfony/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/yaml/Symfony/README.md" />
-		<delete file="${dir}/vendor/symfony/yaml/Symfony/phpunit.xml.dist" />
+		<delete dir="${dir}/vendor/symfony/yaml/Tests" />
+		<delete file="${dir}/vendor/symfony/yaml/.gitignore" />
+		<delete file="${dir}/vendor/symfony/yaml/CHANGELOG.md" />
+		<delete file="${dir}/vendor/symfony/yaml/README.md" />
+		<delete file="${dir}/vendor/symfony/yaml/phpunit.xml.dist" />
 
 		<delete dir="${dir}/vendor/twig/twig/doc" />
 		<delete dir="${dir}/vendor/twig/twig/ext" />
@@ -404,38 +427,9 @@
 		<delete file="${dir}/vendor/twig/twig/.editorconfig" />
 		<delete file="${dir}/vendor/twig/twig/.gitignore" />
 		<delete file="${dir}/vendor/twig/twig/.travis.yml" />
-		<delete file="${dir}/vendor/twig/twig/AUTHORS" />
 		<delete file="${dir}/vendor/twig/twig/CHANGELOG" />
 		<delete file="${dir}/vendor/twig/twig/phpunit.xml.dist" />
-		<delete file="${dir}/vendor/twig/twig/README.markdown" />
-
-		<delete dir="${dir}/vendor/symfony/security-core/.git" />
-		<delete dir="${dir}/vendor/symfony/security-core/Core/Tests" />
-		<delete file="${dir}/vendor/symfony/security-core/Core/.gitignore" />
-		<delete file="${dir}/vendor/symfony/security-core/Core/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/security-core/Core/README.md" />
-		<delete file="${dir}/vendor/symfony/security-core/Core/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/security-csrf/.git" />
-		<delete dir="${dir}/vendor/symfony/security-csrf/Csrf/Tests" />
-		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/.gitignore" />
-		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/README.md" />
-		<delete file="${dir}/vendor/symfony/security-csrf/Csrf/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/twig-bridge/.git" />
-		<delete dir="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/Tests" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/.gitignore" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/README.md" />
-		<delete file="${dir}/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/phpunit.xml.dist" />
-
-		<delete dir="${dir}/vendor/symfony/security/.git" />
-		<delete dir="${dir}/vendor/symfony/security/Tests" />
-		<delete file="${dir}/vendor/symfony/security/.gitignore" />
-		<delete file="${dir}/vendor/symfony/security/CHANGELOG.md" />
-		<delete file="${dir}/vendor/symfony/security/README.md" />
-		<delete file="${dir}/vendor/symfony/security/phpunit.xml.dist" />
+		<delete file="${dir}/vendor/twig/twig/README.rst" />
 	</target>
 
 	<target name="clean-diff-dir">
diff --git a/phpBB/composer.json b/phpBB/composer.json
index 8db3cb1348..fb51fd3141 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -27,8 +27,8 @@
 	"require": {
 		"php": ">=5.4,<7.1",
 		"bantu/ini-get-wrapper": "1.0.*",
-	  	"google/recaptcha": "~1.1",
-		"lusitanian/oauth": "0.2.*",
+		"google/recaptcha": "~1.1",
+		"lusitanian/oauth": "~0.3",
 		"marc1706/fast-image-size": "1.1.*",
 		"patchwork/utf8": "1.1.*",
 		"s9e/text-formatter": "dev-release/php5.3",
@@ -38,26 +38,21 @@
 		"symfony/event-dispatcher": "2.8.*",
 		"symfony/filesystem": "2.8.*",
 		"symfony/finder": "2.8.*",
+		"symfony/http-foundation": "2.8.*",
 		"symfony/http-kernel": "2.8.*",
 		"symfony/routing": "2.8.*",
-		"symfony/security-core": "2.8.*",
-		"symfony/security-csrf": "2.8.*",
 		"symfony/twig-bridge": "2.8.*",
 		"symfony/yaml": "2.8.*",
 		"twig/twig": "1.*"
 	},
 	"require-dev": {
-		"fabpot/goutte": "1.0.*",
-		"phing/phing": "2.4.*",
-		"phpunit/dbunit": "1.3.*",
-		"phpunit/phpunit": "4.1.*",
-		"sami/sami": "1.*",
-		"squizlabs/php_codesniffer": "2.*",
-		"symfony/browser-kit": "2.8.*",
-		"symfony/css-selector": "2.8.*",
-		"symfony/debug": "2.8.*",
-		"symfony/dom-crawler": "2.8.*",
-		"symfony/http-foundation": "2.8.*",
-		"symfony/process": "2.8.*"
+		"fabpot/goutte": "1.0.*@dev",
+		"phing/phing": "2.4.*@dev",
+		"phpunit/dbunit": "1.3.*@dev",
+		"phpunit/phpunit": "4.1.*@dev",
+		"sami/sami": "1.*@dev",
+		"squizlabs/php_codesniffer": "2.*@dev",
+		"symfony/browser-kit": "2.8.*@dev",
+		"symfony/dom-crawler": "2.8.*@dev"
 	}
 }