diff --git a/releng/targets/2018-09/2018-09.target b/releng/targets/2018-09/2018-09.target
index c1a21a0..f7188fa 100644
--- a/releng/targets/2018-09/2018-09.target
+++ b/releng/targets/2018-09/2018-09.target
@@ -5,18 +5,19 @@
 <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<!-- Milestone platform build for 2018-09 M2 -->
-<repository location="http://download.eclipse.org/eclipse/updates/4.9milestones/S-4.9M2-201808012000/"/>
+<!-- Stable platform build for 2018-09 RC2 -->
+<repository location="http://download.eclipse.org/eclipse/updates/4.9milestones/S-4.9RC2-201809060745/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/"/>
+<!-- Milestone build for 2018-09 RC2 -->
+<repository location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201809051333"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.mylyn.sdk_feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/mylyn/snapshots/weekly/"/>
+<repository location="http://download.eclipse.org/mylyn/drops/3.24.2/v20180905-2014/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="ch.qos.logback.classic" version="1.0.7.v20121108-1250"/>
@@ -25,9 +26,10 @@
 <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
 <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
 <unit id="javax.inject" version="1.0.0.v20091030"/>
+<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
 <unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
 <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
-<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20180410-1551"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.5.v20180409-1525"/>
 <unit id="org.apache.httpcomponents.httpcore" version="4.4.9.v20180409-1525"/>
 <unit id="org.apache.lucene.core" version="3.5.0.v20120725-1805"/>
 <unit id="org.apache.lucene.core" version="7.1.0.v20171214-1510"/>
@@ -41,8 +43,8 @@
 <unit id="org.objenesis" version="1.0.0.v201505121915"/>
 <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
 <unit id="org.yaml.snakeyaml" version="1.14.0.v201604211500"/>
-<!-- Stable Orbit build for 2018-09 M2 -->
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180730183850/repository/"/>
+<!-- Recommended Orbit build for 2018-09 -->
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.feature.group" version="2.2.1.201402241301"/>
diff --git a/tests/org.eclipse.epp.logging.aeri.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.epp.logging.aeri.core.tests/META-INF/MANIFEST.MF
index 6b03b76..de80701 100644
--- a/tests/org.eclipse.epp.logging.aeri.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.epp.logging.aeri.core.tests/META-INF/MANIFEST.MF
@@ -21,8 +21,8 @@
  org.eclipse.equinox.event,
  org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.ui,
- org.apache.httpcomponents.httpclient;bundle-version="4.3.6",
- org.apache.httpcomponents.httpcore;bundle-version="4.3.3",
+ org.apache.httpcomponents.httpclient,
+ org.apache.httpcomponents.httpcore,
  com.google.gson;bundle-version="2.2.4",
  org.apache.lucene.core;bundle-version="3.5.0",
  org.eclipse.epp.logging.aeri.tests;bundle-version="1.100.0"