diff --git a/org.eclipse.scout.rt b/org.eclipse.scout.rt
index 3f93ca0..84b5806 160000
--- a/org.eclipse.scout.rt
+++ b/org.eclipse.scout.rt
@@ -1 +1 @@
-Subproject commit 3f93ca007801d368672c73a16ee0a715c3372598
+Subproject commit 84b5806ed868aa23cd209a4066c60b018aed5ee4
diff --git a/org.eclipse.scout.rt.rap.target/org.eclipse.scout.rt.rap.target_template.target b/org.eclipse.scout.rt.rap.target/org.eclipse.scout.rt.rap.target_template.target
index e826c4c..c9245dc 100644
--- a/org.eclipse.scout.rt.rap.target/org.eclipse.scout.rt.rap.target_template.target
+++ b/org.eclipse.scout.rt.rap.target/org.eclipse.scout.rt.rap.target_template.target
@@ -2,7 +2,7 @@
 <?pde version="3.6"?><target name="Rap" sequenceNumber="13">
   <locations>
     <location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-    <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/M6-20150324-0943/"/>
+    <repository id="rap_3.0" location="http://download.eclipse.org/rt/rap/3.0/M7-20150505-1714/"/>
       <unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
     </location>
 
diff --git a/org.eclipse.scout.sdk b/org.eclipse.scout.sdk
index 1cc9fb5..d04c44c 160000
--- a/org.eclipse.scout.sdk
+++ b/org.eclipse.scout.sdk
@@ -1 +1 @@
-Subproject commit 1cc9fb5f4c5edf9e1d23dfcc22d722b1e785725a
+Subproject commit d04c44cb88d554511b023b88f83111921f440c7d