diff --git a/fortiss-std-env/buckminster/af3-micro.cquery b/fortiss-std-env/buckminster/af3-micro.cquery
index 5de2c4c79b06e8a7888f6791ac065d6e5caafe43..22e42866afcc2c5fb8736e93546aa68caa113c09 100644
--- a/fortiss-std-env/buckminster/af3-micro.cquery
+++ b/fortiss-std-env/buckminster/af3-micro.cquery
@@ -6,4 +6,6 @@
     <cq:advisorNode namePattern="^org\.unicase\..*" componentType="osgi.bundle" sourceLevel="REJECT"/>
     <cq:advisorNode namePattern="^org\.fortiss\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
     <cq:advisorNode namePattern="^edu\.tum\.cs\.cope\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
+    <cq:advisorNode namePattern="^org\.eclipse\.emf\.emfstore\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
+    <cq:advisorNode namePattern="^org\.eclipse\.emf\.ecp\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
 </cq:componentQuery>
diff --git a/fortiss-std-env/buckminster/fortiss.rmap b/fortiss-std-env/buckminster/fortiss.rmap
index 494d4f9cecca4a711bd85b11c1f1c038898fae46..e53be5230890d1ffd2b2fac77871f6ae8328a137 100644
--- a/fortiss-std-env/buckminster/fortiss.rmap
+++ b/fortiss-std-env/buckminster/fortiss.rmap
@@ -49,17 +49,19 @@
 
 	<rm:searchPath name="emfstore">
 		<rm:provider
-			readerType="p2"
-			componentTypes="osgi.bundle,eclipse.feature"
-			source="false" mutable="false">
-			<rm:uri format="http://unicase.googlecode.com/svn/updatesite/emfstoreNightly"/>
+			readerType="svn"
+			componentTypes="osgi.bundle"
+			source="true" mutable="false">
+			<rm:uri format="http://unicase.googlecode.com/svn/trunk/core/{0}">
+				<bc:propertyRef key="buckminster.component"/>
+			</rm:uri>
 		</rm:provider>
-		
+
 		<rm:provider
 			readerType="svn"
 			componentTypes="osgi.bundle"
 			source="true" mutable="false">
-			<rm:uri format="http://unicase.googlecode.com/svn/trunk/core/{0}">
+			<rm:uri format="http://unicase.googlecode.com/svn/trunk/emfstore/{0}">
 				<bc:propertyRef key="buckminster.component"/>
 			</rm:uri>
 		</rm:provider>
@@ -120,6 +122,8 @@
   
   <rm:locator pattern="^org\.fortiss\..*" searchPathRef="fortiss"/>
   <rm:locator pattern="^org\.unicase\..*" searchPathRef="emfstore"/>
+  <rm:locator pattern="^org\.eclipse\.emf\.emfstore\..*" searchPathRef="emfstore"/>
+  <rm:locator pattern="^org\.eclipse\.emf\.ecp\..*" searchPathRef="emfstore"/>
   <rm:locator pattern="^org\.conqat\..*" searchPathRef="conqat"/>
   <rm:locator pattern="^edu\.tum\.cs\.cope\..*" searchPathRef="cope"/>
   <rm:locator searchPathRef="helios"/>
diff --git a/fortiss-std-env/buckminster/tooling-kernel-2-0.cquery b/fortiss-std-env/buckminster/tooling-kernel-2-0.cquery
index dfd94a77c872d449f5f0fddc955264da911e2bde..5776d8b6c76d829f3842997e3fdbad6aee02dcc3 100644
--- a/fortiss-std-env/buckminster/tooling-kernel-2-0.cquery
+++ b/fortiss-std-env/buckminster/tooling-kernel-2-0.cquery
@@ -3,7 +3,9 @@
     <cq:documentation xmlns="http://www.w3.org/1999/xhtml">Buckminster materialization of the tooling kernel 2.0 workspace.</cq:documentation>
     <cq:rootRequest name="org.fortiss.tooling.kernel_feature" componentType="eclipse.feature"/>
     <cq:advisorNode namePattern="^org\.conqat\..*" componentType="osgi.bundle" sourceLevel="REJECT"/>
-    <cq:advisorNode namePattern="^org\.unicase\..*" componentType="osgi.bundle" sourceLevel="REJECT"/>
+    <cq:advisorNode namePattern="^org\.unicase\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
     <cq:advisorNode namePattern="^org\.fortiss\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
     <cq:advisorNode namePattern="^edu\.tum\.cs\.cope\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
+    <cq:advisorNode namePattern="^org\.eclipse\.emf\.emfstore\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
+    <cq:advisorNode namePattern="^org\.eclipse\.emf\.ecp\..*" componentType="osgi.bundle" sourceLevel="REQUIRE"/>
 </cq:componentQuery>