diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php
index a899e56657c..6e8dba9c3c4 100755
--- a/releng/org.eclipse.rse.build/template/buildNotes.php
+++ b/releng/org.eclipse.rse.build/template/buildNotes.php
@@ -61,10 +61,14 @@
   newConnectionWizardDelegates</a> 
   in order to better match the standard naming scheme used by the Platform.</li>
 <li><b>Removed</b> the <b>org.eclipse.rse.ui.rseConfigDefaults</b> extension point.
-  Use Java Properties instead, as described in the documentation.</li>
+  Use Java Properties instead, as described in the 
+  <a href="http://dsdp.eclipse.org/help/latest/index.jsp?topic=/org.eclipse.rse.doc.isv/reference/misc/runtime-options.html">
+  runtime-options documentation</a>.</li>
 <li><b>Removed</b> the <b>org.eclipse.rse.ui.passwordPersistence</b> extension point.
   The same functionality is achieved by using the data known from the
-  subsystemConfigurations extension point.</li>
+  IConnectorService implementations of a systemType (supportsUserId(), supportsPassword()).
+  As long as a subsystem supports user id and password, the password can also be persisted.
+  Persistence is always done case sensitive; Persistence cannot be disabled for system types.</li>
 <li><b>Moved</b> several <b>RSE Model Objects and Interfaces</b> from org.eclipse.rse.ui to core:
   <ul>
     <li>(UI) <code>org.eclipse.rse.model</code> --&gt; <code>org.eclipse.rse.core.model</code></li>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html b/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html
index f60f6f98597..8606142ef00 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html
+++ b/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html
@@ -84,12 +84,16 @@ Here are the extension points that are defined by the RSE:
 			<TD>For contributing compile commands to the Compile menus and Work With Compile Commands dialog.</TD>
 		</TR>
 		-->
-		<TR>
-			<TD><A href="../reference/extension-points/org_eclipse_rse_ui_rseConfigDefaults.html">org.eclipse.rse.ui.<b>rseConfigDefaults</b></A></TD>
-			<TD>For solution providers that are building a product that includes RSE, this extension point allows you to
-			    pre-set some out-of-box preference values. For example, whether the New Connection tree item is shown in Remote Systems view.</TD>
-		</TR>
 	</TBODY>
 </TABLE>
+<!-- TODO
+  should we add a reference to the runtime-options here,
+  instead of the old rseConfigDefaults extension point?
+
+  <TD>For solution providers that are building a product that includes RSE, 
+  these runtime options allow you to pre-set some out-of-box preference 
+  values. For example, whether the New Connection tree item is shown in 
+  Remote Systems view.</TD>
+-->
 </body>
 </html>
\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html b/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html
index 3bac97b1b08..4686f958f0c 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html
+++ b/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html
@@ -24,7 +24,6 @@
   <li><a href="org_eclipse_rse_ui_popupMenus.html">org.eclipse.rse.ui.popupMenus</a></li>
   <li><a href="org_eclipse_rse_ui_propertyPages.html">org.eclipse.rse.ui.propertyPages</a></li>
   <li><a href="org_eclipse_rse_ui_remoteSystemsViewPreferencesActions.html">org.eclipse.rse.ui.remoteSystemsViewPreferencesActions</a></li>
-  <li><a href="org_eclipse_rse_ui_rseConfigDefaults.html">org.eclipse.rse.ui.rseConfigDefaults</a></li>
   <li><a href="org_eclipse_rse_ui_subsystemConfigurations.html">org.eclipse.rse.ui.subsystemConfigurations</a></li>
 </ul>
 
diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.properties b/rse/plugins/org.eclipse.rse.ui/plugin.properties
index 8e371322ce2..b5344d3925c 100644
--- a/rse/plugins/org.eclipse.rse.ui/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.ui/plugin.properties
@@ -26,7 +26,6 @@ extPoint.remoteSystemsViewPreferencesActions = Remote Systems View Preferences A
 extPoint.compile = Remote Compile Commands
 extPoint.archivehandlers = Remote Archive Handlers
 extPoint.mountPathMappers = Mount Path Mappers
-extPoint.rseConfigDefaults = Configure Remote System Explorer Defaults
 
 systemType.iseries = iSeries native operating system (OS/400 or i5/OS)
 systemType.iseries.PASE = PASE on iSeries
diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml
index ae64e70d59e..016c8b283d8 100644
--- a/rse/plugins/org.eclipse.rse.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml
@@ -381,31 +381,6 @@ Contributors:
 	
 	<extension-point id="remoteSystemsViewPreferencesActions" name="%extPoint.remoteSystemsViewPreferencesActions" schema="schema/remoteSystemsViewPreferencesActions.exsd"/>
 	
-<!-- ================================================================================== -->
-<!-- EXTENSION POINT: org.eclipse.rse.ui.showNewConnectionPrompt               -->
-<!-- ================================================================================== -->
-<!-- This extension point is for products that include RSE, which want to affect some   -->
-<!--  of the out of box defaults for preferences. The preferences currently supported   -->
-<!--  are:                                                                              -->
-<!--     showNewConnectionPrompt -> specify false to not see the New Connection prompt  -->
-<!--                                  in the Remote Systems view.                       -->
-<!--     showLocalConnection -> specify false to not pre-create a Local connection      -->
-<!--     enableSystemTypes -> specify the system types to enable, semicolon-separated. All  -->
-<!--                       others are disabled, but can be re-enabled via preferences.  -->
-<!-- Usually, these settings can still be overridden by users via preferences.          -->
-<!--                                                                                    -->
-<!-- Example usage:                                                                     -->
-<!--   <extension point="org.eclipse.rse.ui.rseConfigDefaults">                -->
-<!--        <defaults id="xyz"                                                          -->
-<!--			  productId="com.mycompany.myproduct"                                   -->
-<!--              showNewConnectionPrompt="false" showLocalConnection="false"           -->
-<!--              enableSystemTypes="Local;Linux;Unix">                                 -->
-<!--        </defaults>                                                                 -->
-<!--   </extension>                                                                     -->
-<!-- See the extension point reference for more details.                                -->
-
-	<extension-point id="rseConfigDefaults" name="%extPoint.rseConfigDefaults" schema="schema/rseConfigDefaults.exsd"/>     	
-	
 <!-- ============================================ -->
 <!-- Define a RemoteSystems project nature        -->
 <!-- ============================================ -->
diff --git a/rse/plugins/org.eclipse.rse.ui/schema/rseConfigDefaults.exsd b/rse/plugins/org.eclipse.rse.ui/schema/rseConfigDefaults.exsd
deleted file mode 100644
index a0fb60e6523..00000000000
--- a/rse/plugins/org.eclipse.rse.ui/schema/rseConfigDefaults.exsd
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.rse.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.rse.ui" id="rseConfigDefaults" name="Configure Remote System Explorer Defaults"/>
-      </appInfo>
-      <documentation>
-         This extension point is for products that include RSE, which want to affect some of the out of box defaults for RSE. Some of these can be overridden by users (for example, through preferences).
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="defaults">
-      <complexType>
-         <attribute name="productId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The product ID of the product that is setting the RSE default configuration. RSE will query the product ID of the platform and check for a match with the given ID.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="showNewConnectionPrompt" type="boolean">
-            <annotation>
-               <documentation>
-                  Specify true to show the New Connection prompt in the Remote Systems view by default, false to not show it. Users can still override this via preferences. The default is true.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="showLocalConnection" type="boolean">
-            <annotation>
-               <documentation>
-                  Specify true to pre-create a Local connection for new users, false not to do this. The default is true.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="enableSystemTypes" type="string">
-            <annotation>
-               <documentation>
-                  Specify semicolon-separated list of system type names to enable. Specify the system type names, not translated. These are not case sensitive. All other system types will be disabled, but user can enable them via preferences. Disabled system types do not appear in the New Connection wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="showProfilePage" type="boolean">
-            <annotation>
-               <documentation>
-                  Specify true to show the profile name wizard page in the New Connection wizard, or false to not show it. The default is true. If this is set to false, then RSE will create a profile with the name same as the machine name of the workstation, and create the first connection in that profile.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         6.2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         &lt;h3&gt;Example One&lt;/h3&gt;
-The following is an example of how to turn off the showing of the new connection prompt:
-&lt;p&gt;
-&lt;pre&gt;
-&lt;extension point=&quot;org.eclipse.rse.ui.rseConfigDefaults&quot;&gt;
- &lt;defaults id=&quot;xyz&quot; productId=&quot;com.mycompany.myproduct&quot; showNewConnectionPrompt=&quot;false&quot; showLocalConnection=&quot;true&quot;
-    enableSystemTypes=&quot;Local;Linux;Unix&quot;&gt;
- &lt;/defaults&gt;
-&lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         Not applicable
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         Not applicable
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2002, 2006 IBM Corporation. All Rights Reserved.
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v1.0 which accompanies this distribution, and is 
-available at http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-IBM Corporation - initial API and implementation
-      </documentation>
-   </annotation>
-
-</schema>