diff --git a/fortiss-std-env/buckminster/fortiss.rmap b/fortiss-std-env/buckminster/fortiss.rmap
index ccc07282a211da0796d58528312167132c13fdb4..34908adc7081383144f1111251ffc9e57903405e 100644
--- a/fortiss-std-env/buckminster/fortiss.rmap
+++ b/fortiss-std-env/buckminster/fortiss.rmap
@@ -5,17 +5,17 @@
   <rm:locator searchPathRef="juno"/>
   <rm:searchPath name="fortiss">
     <rm:provider componentTypes="osgi.bundle" readerType="svn">
-      <rm:uri format="https://proxy_svn:proxy_svn@orion.fortiss.org/svn/af3/{0}/trunk">
+      <rm:uri format="https://proxy_svn:dW09WmzRcCUF@orion.fortiss.org/svn/af3/{0}/trunk">
         <bc:propertyRef key="buckminster.component"/>
       </rm:uri>
     </rm:provider>
     <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="svn">
-      <rm:uri format="https://proxy_svn:proxy_svn@orion.fortiss.org/svn/af3/features/{0}">
+      <rm:uri format="https://proxy_svn:dW09WmzRcCUF@orion.fortiss.org/svn/af3/features/{0}">
         <bc:propertyRef key="buckminster.component"/>
       </rm:uri>
     </rm:provider>
     <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="svn">
-      <rm:uri format="https://proxy_svn:proxy_svn@orion.fortiss.org/svn/af3/products/{0}">
+      <rm:uri format="https://proxy_svn:dW09WmzRcCUF@orion.fortiss.org/svn/af3/products/{0}">
         <bc:propertyRef key="buckminster.component"/>
       </rm:uri>
     </rm:provider>
diff --git a/fortiss-std-env/buckminster/fortiss_indigo.rmap b/fortiss-std-env/buckminster/fortiss_indigo.rmap
index 0e8ee4e9e6f08fe3af344ca683ccd40aa856e431..72618ce2d4e6e0514aa71d592fd017bc7ca4748d 100644
--- a/fortiss-std-env/buckminster/fortiss_indigo.rmap
+++ b/fortiss-std-env/buckminster/fortiss_indigo.rmap
@@ -1,82 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rm:rmap
- xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:mp="http://www.eclipse.org/buckminster/MavenProvider-1.0"
- xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0">
-
-	<rm:searchPath name="fortiss">
-		<rm:provider
-			readerType="svn"
-			componentTypes="osgi.bundle"
-			source="true" mutable="true">
-			<rm:uri format="https://proxy_svn:proxy_svn@orion.fortiss.org/svn/af3/{0}/trunk">
-				<bc:propertyRef key="buckminster.component"/>
-			</rm:uri>
-		</rm:provider>
-
-		<rm:provider
-			readerType="svn"
-			componentTypes="eclipse.feature,osgi.bundle"
-			source="true" mutable="true">
-			<rm:uri format="https://proxy_svn:proxy_svn@orion.fortiss.org/svn/af3/features/{0}">
-				<bc:propertyRef key="buckminster.component"/>
-			</rm:uri>
-		</rm:provider>
-
-		<rm:provider
-			readerType="svn"
-			componentTypes="eclipse.feature,osgi.bundle"
-			source="true" mutable="true">
-			<rm:uri format="https://proxy_svn:proxy_svn@orion.fortiss.org/svn/af3/products/{0}">
-				<bc:propertyRef key="buckminster.component"/>
-			</rm:uri>
-		</rm:provider>
-	</rm:searchPath>
-
-	<rm:searchPath name="indigo">
-		<rm:provider
-			readerType="p2"
-			componentTypes="osgi.bundle,eclipse.feature"
-			source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/releases/indigo"/>
-		</rm:provider>
-
-		<rm:provider
-			readerType="p2"
-			componentTypes="osgi.bundle,eclipse.feature"
-			source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/eclipse/updates/3.7"/>
-		</rm:provider>		
-
-		<rm:provider
-			readerType="p2"
-			componentTypes="osgi.bundle,eclipse.feature"
-			source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>
-		</rm:provider>		
-	</rm:searchPath>
-  
-	<rm:searchPath name="lwjgl">
-		<rm:provider
-			readerType="p2"
-			componentTypes="osgi.bundle,eclipse.feature"
-			source="false" mutable="false">
-			<rm:uri format="http://lwjgl.org/update"/>
-		</rm:provider>
-	</rm:searchPath>
-   
-    <rm:searchPath name="nebula">
-		<rm:provider
-			readerType="p2"
-			componentTypes="osgi.bundle,eclipse.feature"
-			source="false" mutable="false">
-			<rm:uri format="http://download.eclipse.org/technology/nebula/snapshot"/>
-		</rm:provider>
-   </rm:searchPath>
-  
+<rm:rmap xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
   <rm:locator pattern="^org\.fortiss\..*" searchPathRef="fortiss"/>
   <rm:locator pattern="^org\.lwjgl.*" searchPathRef="lwjgl"/>
   <rm:locator pattern="^org\.eclipse\.nebula.*" searchPathRef="nebula"/>
   <rm:locator searchPathRef="indigo"/>
+  <rm:searchPath name="fortiss">
+    <rm:provider componentTypes="osgi.bundle" readerType="svn">
+      <rm:uri format="https://proxy_svn:dW09WmzRcCUF@orion.fortiss.org/svn/af3/{0}/trunk">
+        <bc:propertyRef key="buckminster.component"/>
+      </rm:uri>
+    </rm:provider>
+    <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="svn">
+      <rm:uri format="https://proxy_svn:dW09WmzRcCUF@orion.fortiss.org/svn/af3/features/{0}">
+        <bc:propertyRef key="buckminster.component"/>
+      </rm:uri>
+    </rm:provider>
+    <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="svn">
+      <rm:uri format="https://proxy_svn:dW09WmzRcCUF@orion.fortiss.org/svn/af3/products/{0}">
+        <bc:propertyRef key="buckminster.component"/>
+      </rm:uri>
+    </rm:provider>
+  </rm:searchPath>
+  <rm:searchPath name="indigo">
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
+      <rm:property key="buckminster.source" value="false"/>
+      <rm:property key="buckminster.mutable" value="false"/>
+      <rm:uri format="http://download.eclipse.org/releases/indigo"/>
+    </rm:provider>
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
+      <rm:property key="buckminster.source" value="false"/>
+      <rm:property key="buckminster.mutable" value="false"/>
+      <rm:uri format="http://download.eclipse.org/eclipse/updates/3.7"/>
+    </rm:provider>
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
+      <rm:property key="buckminster.source" value="false"/>
+      <rm:property key="buckminster.mutable" value="false"/>
+      <rm:uri format="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>
+    </rm:provider>
+  </rm:searchPath>
+  <rm:searchPath name="lwjgl">
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
+      <rm:property key="buckminster.source" value="false"/>
+      <rm:property key="buckminster.mutable" value="false"/>
+      <rm:uri format="http://lwjgl.org/update"/>
+    </rm:provider>
+  </rm:searchPath>
+  <rm:searchPath name="nebula">
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
+      <rm:property key="buckminster.source" value="false"/>
+      <rm:property key="buckminster.mutable" value="false"/>
+      <rm:uri format="http://download.eclipse.org/technology/nebula/snapshot"/>
+    </rm:provider>
+  </rm:searchPath>
 </rm:rmap>