diff --git a/pom.xml b/pom.xml
index 3df0918..6b63d21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
 	<properties>
 		<loggingVersion>2.0.7-SNAPSHOT</loggingVersion>
 		<javaVersion>1.8</javaVersion>
-		<tychoVersion>1.1.0</tychoVersion>
+		<tychoVersion>1.2.0</tychoVersion>
 		<!-- The default simultaneous release used to base the target platform 
 			on (override with -Dsimrel=...) -->
 		<simrel>photon</simrel>
diff --git a/releng/targets/photon/photon.target b/releng/targets/photon/photon.target
index 0b1e19b..a2ede59 100644
--- a/releng/targets/photon/photon.target
+++ b/releng/targets/photon/photon.target
@@ -1,22 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="Target Definition for Eclipse Photon (4.8)" sequenceNumber="1">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="Target Definition for Eclipse Photon (4.8)" sequenceNumber="2">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
 <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"/>
-<!-- Stable platform build for Photon M6 -->
-<repository location="http://download.eclipse.org/eclipse/updates/4.8milestones/S-4.8M6-201803080630/"/>
-</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/updates/2.13/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="0.0.0"/>
 <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/"/>
+<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+<!-- Stable platform build for Photon R -->
+<repository location="http://download.eclipse.org/releases/photon/201806271001/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="ch.qos.logback.classic" version="1.0.7.v20121108-1250"/>
@@ -27,22 +21,22 @@
 <unit id="javax.inject" version="1.0.0.v20091030"/>
 <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.v20170210-0925"/>
-<unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20180410-1551"/>
+<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"/>
 <unit id="org.apache.lucene.analyzers-common" version="7.1.0.v20180122-2126"/>
 <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
 <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
-<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
+<unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
 <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
 <unit id="org.junit" version="4.12.0.v201504281640"/>
 <unit id="org.mockito" version="1.9.5.v201605172210"/>
 <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 Photon M6 -->
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20180302171354/repository"/>
+<!-- Stable Orbit build for Photon R -->
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/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"/>