diff --git a/rse/features/org.eclipse.rse.core-feature/build.properties b/rse/features/org.eclipse.rse.core-feature/build.properties
index 6b524faa565..279df8fba9f 100644
--- a/rse/features/org.eclipse.rse.core-feature/build.properties
+++ b/rse/features/org.eclipse.rse.core-feature/build.properties
@@ -2,4 +2,3 @@ bin.includes = feature.xml,\
                license.html,\
                feature.properties,\
                epl-v10.html
-generate.feature@org.eclipse.rse.core.source=org.eclipse.rse.core
\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.xml b/rse/features/org.eclipse.rse.core-feature/feature.xml
index 49f9051aaeb..164e0ef1911 100644
--- a/rse/features/org.eclipse.rse.core-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.core-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse.core"
       label="%featureName"
-      version="1.0.0"
+      version="1.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,10 +18,6 @@
       <discovery label="%updateSiteName" url="http://update.eclipse.org/updates/3.2"/>
    </url>
 
-   <includes
-         id="org.eclipse.rse.core.source"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties
index a2108f2bc3e..f93e231e035 100644
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties
+++ b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties
@@ -13,8 +13,10 @@
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # fill-ins are supplied by about.mappings
 # This file should be translated.
+#
+# Do not translate any values surrounded by {}
 
-blurb=RSE Core Source\n\
+blurb=Remote System Explorer Core Source\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/rse/features/org.eclipse.rse.dstore-feature/build.properties b/rse/features/org.eclipse.rse.dstore-feature/build.properties
index 073ce76663b..279df8fba9f 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/build.properties
+++ b/rse/features/org.eclipse.rse.dstore-feature/build.properties
@@ -2,4 +2,3 @@ bin.includes = feature.xml,\
                license.html,\
                feature.properties,\
                epl-v10.html
-generate.feature@org.eclipse.rse.dstore.source=org.eclipse.rse.dstore
\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.xml b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
index 9e9e5036eaa..a25a95e0a8c 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
@@ -2,8 +2,9 @@
 <feature
       id="org.eclipse.rse.dstore"
       label="%featureName"
-      version="1.0.0"
-      provider-name="%providerName">
+      version="1.0.0.qualifier"
+      provider-name="%providerName"
+      plugin="org.eclipse.rse.services.dstore">
 
    <description>
       %description
@@ -18,10 +19,6 @@
       <discovery label="%updateSiteName" url="http://update.eclipse.org/updates/3.2"/>
    </url>
 
-   <includes
-         id="org.eclipse.rse.dstore.source"
-         version="0.0.0"/>
-
    <requires>
       <import feature="org.eclipse.rse.core"/>
       <import plugin="org.eclipse.ui"/>
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties
index 08490065823..baec57340e5 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties
+++ b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties
@@ -13,8 +13,10 @@
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # fill-ins are supplied by about.mappings
 # This file should be translated.
+#
+# Do not translate any values surrounded by {}
 
-blurb=RSE DStore Services Source\n\
+blurb=Remote System Explorer DStore Services Source\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/rse/features/org.eclipse.rse.ftp-feature/build.properties b/rse/features/org.eclipse.rse.ftp-feature/build.properties
index 1292a7ac461..94bb8830ab8 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/build.properties
+++ b/rse/features/org.eclipse.rse.ftp-feature/build.properties
@@ -2,4 +2,3 @@ bin.includes = feature.xml,\
                feature.properties,\
                license.html,\
                epl-v10.html
-generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
index 6c87847866c..2c6315e247c 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
@@ -2,8 +2,9 @@
 <feature
       id="org.eclipse.rse.ftp"
       label="%featureName"
-      version="1.0.0"
-      provider-name="%providerName">
+      version="1.0.0.qualifier"
+      provider-name="%providerName"
+      plugin="org.eclipse.rse.services.files.ftp">
 
    <description>
       %description
@@ -18,10 +19,6 @@
       <discovery label="%updateSiteName" url="http://update.eclipse.org/updates/3.2"/>
    </url>
 
-   <includes
-         id="org.eclipse.rse.ftp.source"
-         version="0.0.0"/>
-
    <requires>
       <import feature="org.eclipse.rse.core"/>
       <import plugin="org.eclipse.ui"/>
diff --git a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.properties
index 58088a7c1d5..3517b9adcf1 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.properties
+++ b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.properties
@@ -13,8 +13,10 @@
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # fill-ins are supplied by about.mappings
 # This file should be translated.
+#
+# Do not translate any values surrounded by {}
 
-blurb=RSE FTP Services Source\n\
+blurb=Remote System Explorer FTP Services Source\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/rse/features/org.eclipse.rse.local-feature/build.properties b/rse/features/org.eclipse.rse.local-feature/build.properties
index fff7f823055..94bb8830ab8 100644
--- a/rse/features/org.eclipse.rse.local-feature/build.properties
+++ b/rse/features/org.eclipse.rse.local-feature/build.properties
@@ -2,4 +2,3 @@ bin.includes = feature.xml,\
                feature.properties,\
                license.html,\
                epl-v10.html
-generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.local-feature/feature.xml b/rse/features/org.eclipse.rse.local-feature/feature.xml
index 9a49706d15b..64784dc3b99 100644
--- a/rse/features/org.eclipse.rse.local-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.local-feature/feature.xml
@@ -2,8 +2,9 @@
 <feature
       id="org.eclipse.rse.local"
       label="%featureName"
-      version="1.0.0"
-      provider-name="%providerName">
+      version="1.0.0.qualifier"
+      provider-name="%providerName"
+      plugin="org.eclipse.rse.services.local">
 
    <description>
       %description
@@ -18,10 +19,6 @@
       <discovery label="%updateSiteName" url="http://update.eclipse.org/updates/3.2"/>
    </url>
 
-   <includes
-         id="org.eclipse.rse.local.source"
-         version="0.0.0"/>
-
    <requires>
       <import feature="org.eclipse.rse.core"/>
       <import plugin="org.eclipse.ui"/>
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties
index 26c0aca3045..29b1ab3cf43 100644
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties
+++ b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties
@@ -13,8 +13,10 @@
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # fill-ins are supplied by about.mappings
 # This file should be translated.
+#
+# Do not translate any values surrounded by {}
 
-blurb=RSE Local Services Source\n\
+blurb=Remote System Explorer Local Services Source\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
index c42c9abdbdd..510c42d7a5f 100644
--- a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.dstore.core
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.dstore.core.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.dstore.core/build.properties b/rse/plugins/org.eclipse.dstore.core/build.properties
index 849ee4120bc..fa5f6c718b7 100644
--- a/rse/plugins/org.eclipse.dstore.core/build.properties
+++ b/rse/plugins/org.eclipse.dstore.core/build.properties
@@ -3,7 +3,6 @@ bin.includes = .,\
                plugin.properties,\
                about.html,\
                META-INF/
-src.includes = about.html
 source.. = src/
 output.. = bin/
 source.dstore_core.jar = src/
diff --git a/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF
index a7c4bf6e9e7..26e0d62906b 100644
--- a/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.dstore.extra
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.dstore.extra.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.dstore.extra/build.properties b/rse/plugins/org.eclipse.dstore.extra/build.properties
index 77319918a91..ab638f3c2ce 100644
--- a/rse/plugins/org.eclipse.dstore.extra/build.properties
+++ b/rse/plugins/org.eclipse.dstore.extra/build.properties
@@ -7,4 +7,3 @@ source.. = src/
 output.. = bin/
 source.dstore_extra_server.jar = server/
 output.dstore_extra_server.jar = server.bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
index a1773ef0c6e..74a01b134f2 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.connectorservice.dstore
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.connectorservice.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties b/rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties
index 102e3697406..cd3628329e6 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties
+++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties
@@ -4,4 +4,3 @@ bin.includes = .,\
                plugin.properties
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF
index 0e0f76a87b2..01826b072af 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.connectorservice.local
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.connectorservice.local.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/build.properties b/rse/plugins/org.eclipse.rse.connectorservice.local/build.properties
index 102e3697406..cd3628329e6 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/build.properties
+++ b/rse/plugins/org.eclipse.rse.connectorservice.local/build.properties
@@ -4,4 +4,3 @@ bin.includes = .,\
                plugin.properties
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
index 01607351c94..d1e11d7347e 100644
--- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.core;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.core.RSECorePlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime
diff --git a/rse/plugins/org.eclipse.rse.core/about.ini b/rse/plugins/org.eclipse.rse.core/about.ini
new file mode 100644
index 00000000000..c14b38f4c21
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.core/about.ini
@@ -0,0 +1,27 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%blurb
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=eclipse32.gif
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/about.mappings b/rse/plugins/org.eclipse.rse.core/about.mappings
new file mode 100644
index 00000000000..bddaab43109
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.core/about.mappings
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/about.properties b/rse/plugins/org.eclipse.rse.core/about.properties
index 4dcb5746577..c39eaae06f8 100644
--- a/rse/plugins/org.eclipse.rse.core/about.properties
+++ b/rse/plugins/org.eclipse.rse.core/about.properties
@@ -22,4 +22,4 @@ Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
 (c) Copyright Eclipse contributors and others 2000, 2006.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm/
+Visit http://www.eclipse.org/dsdp/tm
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/build.properties b/rse/plugins/org.eclipse.rse.core/build.properties
index a12b3b4f5fd..c628715da7c 100644
--- a/rse/plugins/org.eclipse.rse.core/build.properties
+++ b/rse/plugins/org.eclipse.rse.core/build.properties
@@ -4,7 +4,9 @@ bin.includes = META-INF/,\
                about.properties,\
                about.html,\
                .,\
-               schema/
+               schema/,\
+               about.ini,\
+               about.mappings,\
+               eclipse32.gif
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.core/eclipse32.gif b/rse/plugins/org.eclipse.rse.core/eclipse32.gif
new file mode 100644
index 00000000000..e6ad7ccd75b
Binary files /dev/null and b/rse/plugins/org.eclipse.rse.core/eclipse32.gif differ
diff --git a/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF
index 94fd1684755..462fcfb05e1 100644
--- a/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.dstore.security; singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.dstore.security.UniversalSecurityPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.dstore.security/build.properties b/rse/plugins/org.eclipse.rse.dstore.security/build.properties
index 3adc8559855..e43469490c3 100644
--- a/rse/plugins/org.eclipse.rse.dstore.security/build.properties
+++ b/rse/plugins/org.eclipse.rse.dstore.security/build.properties
@@ -6,4 +6,3 @@ bin.includes = about.html,\
                META-INF/
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.eclipse.filesystem/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.eclipse.filesystem/META-INF/MANIFEST.MF
index d1f944050bb..d793e9cc69a 100644
--- a/rse/plugins/org.eclipse.rse.eclipse.filesystem/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.eclipse.filesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.eclipse.filesystem; singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.eclipse.filesystem.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.eclipse.filesystem/build.properties b/rse/plugins/org.eclipse.rse.eclipse.filesystem/build.properties
index d73230f0f86..75d128a7ea9 100644
--- a/rse/plugins/org.eclipse.rse.eclipse.filesystem/build.properties
+++ b/rse/plugins/org.eclipse.rse.eclipse.filesystem/build.properties
@@ -5,4 +5,3 @@ bin.includes = META-INF/,\
                .
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF
index 45a8a163ff5..298a1f74c0b 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.files.ui;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.files.ui.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.files.ui/build.properties b/rse/plugins/org.eclipse.rse.files.ui/build.properties
index 3b2c7118d58..6202e32fd94 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/build.properties
+++ b/rse/plugins/org.eclipse.rse.files.ui/build.properties
@@ -6,4 +6,3 @@ bin.includes = META-INF/,\
                .
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF
index 922d9d87b1a..64c8e13e842 100644
--- a/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.logging;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.logging.RemoteSystemsLoggingPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.logging/build.properties b/rse/plugins/org.eclipse.rse.logging/build.properties
index f053f1036e3..7ec1cc0eea6 100644
--- a/rse/plugins/org.eclipse.rse.logging/build.properties
+++ b/rse/plugins/org.eclipse.rse.logging/build.properties
@@ -8,4 +8,3 @@ bin.includes = HelpContexts.xml,\
                META-INF/
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF
index a2bc9e126ac..d6b72de1057 100644
--- a/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.processes.ui;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.processes.ui.ProcessesPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.processes.ui/build.properties b/rse/plugins/org.eclipse.rse.processes.ui/build.properties
index d35961b86da..d1f8e5fdaa1 100644
--- a/rse/plugins/org.eclipse.rse.processes.ui/build.properties
+++ b/rse/plugins/org.eclipse.rse.processes.ui/build.properties
@@ -9,4 +9,3 @@ bin.includes = META-INF/,\
                .
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
index b3d04fa2082..bb5cb5aab8e 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.services.dstore
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.services.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/about.ini b/rse/plugins/org.eclipse.rse.services.dstore/about.ini
new file mode 100644
index 00000000000..c14b38f4c21
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.services.dstore/about.ini
@@ -0,0 +1,27 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%blurb
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=eclipse32.gif
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/about.mappings b/rse/plugins/org.eclipse.rse.services.dstore/about.mappings
new file mode 100644
index 00000000000..bddaab43109
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.services.dstore/about.mappings
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/about.properties b/rse/plugins/org.eclipse.rse.services.dstore/about.properties
index 8eec86572ff..0fa82c50742 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/about.properties
+++ b/rse/plugins/org.eclipse.rse.services.dstore/about.properties
@@ -16,10 +16,10 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Remote System Explorer dstore services\n\
+blurb=Remote System Explorer DStore Services\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
 (c) Copyright Eclipse contributors and others 2000, 2006.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm/
+Visit http://www.eclipse.org/dsdp/tm
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/build.properties b/rse/plugins/org.eclipse.rse.services.dstore/build.properties
index 1a32ba1de98..83eeba9dd2c 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/build.properties
+++ b/rse/plugins/org.eclipse.rse.services.dstore/build.properties
@@ -3,10 +3,12 @@ bin.includes = META-INF/,\
                about.properties,\
                plugin.properties,\
                dstore_miners.jar,\
-               .
+               .,\
+               about.ini,\
+               about.mappings,\
+               eclipse32.gif
 source.. = src/,miners/
 output.. = bin/
 jars.compile.order = dstore_miners.jar,.
 source.dstore_miners.jar = miners/
 output.dstore_miners.jar = miners.bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/eclipse32.gif b/rse/plugins/org.eclipse.rse.services.dstore/eclipse32.gif
new file mode 100644
index 00000000000..e6ad7ccd75b
Binary files /dev/null and b/rse/plugins/org.eclipse.rse.services.dstore/eclipse32.gif differ
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
index 00761ba4220..3987c2945cb 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.services.files.ftp
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.services.files.ftp.Activator
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/about.ini b/rse/plugins/org.eclipse.rse.services.files.ftp/about.ini
new file mode 100644
index 00000000000..c14b38f4c21
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/about.ini
@@ -0,0 +1,27 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%blurb
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=eclipse32.gif
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/about.mappings b/rse/plugins/org.eclipse.rse.services.files.ftp/about.mappings
new file mode 100644
index 00000000000..bddaab43109
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/about.mappings
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/about.properties b/rse/plugins/org.eclipse.rse.services.files.ftp/about.properties
index a5c11a0586c..20b529f0154 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/about.properties
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/about.properties
@@ -16,10 +16,10 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Remote System Explorer FTP services\n\
+blurb=Remote System Explorer FTP Services\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
 (c) Copyright Eclipse contributors and others 2000, 2006.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm/
+Visit http://www.eclipse.org/dsdp/tm
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/build.properties b/rse/plugins/org.eclipse.rse.services.files.ftp/build.properties
index e45e3361e72..a8fd7645675 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/build.properties
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/build.properties
@@ -2,7 +2,9 @@ bin.includes = META-INF/,\
                about.html,\
                about.properties,\
                plugin.properties,\
-               .
+               .,\
+               about.ini,\
+               about.mappings,\
+               eclipse32.gif
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/eclipse32.gif b/rse/plugins/org.eclipse.rse.services.files.ftp/eclipse32.gif
new file mode 100644
index 00000000000..e6ad7ccd75b
Binary files /dev/null and b/rse/plugins/org.eclipse.rse.services.files.ftp/eclipse32.gif differ
diff --git a/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF
index bf3e0e37fb8..c3b0fbf3b20 100644
--- a/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.services.local;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.services.local.Activator
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
diff --git a/rse/plugins/org.eclipse.rse.services.local/about.ini b/rse/plugins/org.eclipse.rse.services.local/about.ini
new file mode 100644
index 00000000000..c14b38f4c21
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.services.local/about.ini
@@ -0,0 +1,27 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%blurb
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=eclipse32.gif
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.services.local/about.mappings b/rse/plugins/org.eclipse.rse.services.local/about.mappings
new file mode 100644
index 00000000000..bddaab43109
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.services.local/about.mappings
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.services.local/about.properties b/rse/plugins/org.eclipse.rse.services.local/about.properties
index 4f875867775..e56f99c4204 100644
--- a/rse/plugins/org.eclipse.rse.services.local/about.properties
+++ b/rse/plugins/org.eclipse.rse.services.local/about.properties
@@ -16,10 +16,10 @@
 #
 # Do not translate any values surrounded by {}
 
-blurb=Remote System Explorer local services\n\
+blurb=Remote System Explorer Local Services\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
 (c) Copyright Eclipse contributors and others 2000, 2006.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm/
+Visit http://www.eclipse.org/dsdp/tm
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.services.local/build.properties b/rse/plugins/org.eclipse.rse.services.local/build.properties
index 669d3a962a5..a1fd9e32578 100644
--- a/rse/plugins/org.eclipse.rse.services.local/build.properties
+++ b/rse/plugins/org.eclipse.rse.services.local/build.properties
@@ -3,7 +3,9 @@ bin.includes = META-INF/,\
                about.properties,\
                plugin.properties,\
                .,\
-               patterns.dat
+               patterns.dat,\
+               about.ini,\
+               about.mappings,\
+               eclipse32.gif
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.services.local/eclipse32.gif b/rse/plugins/org.eclipse.rse.services.local/eclipse32.gif
new file mode 100644
index 00000000000..e6ad7ccd75b
Binary files /dev/null and b/rse/plugins/org.eclipse.rse.services.local/eclipse32.gif differ
diff --git a/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
index 1616d51500d..529d2942a42 100644
--- a/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.services
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.services.Activator
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
diff --git a/rse/plugins/org.eclipse.rse.services/build.properties b/rse/plugins/org.eclipse.rse.services/build.properties
index 624291398fc..edb8010fe7d 100644
--- a/rse/plugins/org.eclipse.rse.services/build.properties
+++ b/rse/plugins/org.eclipse.rse.services/build.properties
@@ -8,4 +8,3 @@ source.clientserver.jar = clientserver/
 output.clientserver.jar = clientserver.bin/
 source.. = src/,clientserver/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF
index 2a3b9d2163e..b49ec52ef76 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.shells.ui;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.shells.ui.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/build.properties b/rse/plugins/org.eclipse.rse.shells.ui/build.properties
index 3b2c7118d58..6202e32fd94 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/build.properties
+++ b/rse/plugins/org.eclipse.rse.shells.ui/build.properties
@@ -6,4 +6,3 @@ bin.includes = META-INF/,\
                .
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
index 74c561b7943..540b3840ab0 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.subsystems.files.core
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.files.core.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/build.properties b/rse/plugins/org.eclipse.rse.subsystems.files.core/build.properties
index 4e900254e78..f0ff6f5a13a 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/build.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/build.properties
@@ -4,4 +4,3 @@ bin.includes = META-INF/,\
                .
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF
index 570afa80580..0a108d5190f 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.subsystems.files.dstore;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.files.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/build.properties b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/build.properties
index f15dd5f0fa4..fb2d817a6ca 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/build.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/build.properties
@@ -6,4 +6,3 @@ bin.includes = META-INF/,\
                .
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF
index 21ecf43ce58..71ffcf8e519 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.subsystems.files.ftp;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.files.ftp.Activator
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/build.properties b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/build.properties
index f15dd5f0fa4..fb2d817a6ca 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/build.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/build.properties
@@ -6,4 +6,3 @@ bin.includes = META-INF/,\
                .
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF
index 3554cc396ee..f7946c2c66f 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.subsystems.files.local;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.files.local.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/build.properties b/rse/plugins/org.eclipse.rse.subsystems.files.local/build.properties
index f15dd5f0fa4..fb2d817a6ca 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.local/build.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/build.properties
@@ -6,4 +6,3 @@ bin.includes = META-INF/,\
                .
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF
index bfa15d5a7f7..232845a7748 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.subsystems.processes.core;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
 Export-Package: org.eclipse.rse.subsystems.processes.core,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/build.properties b/rse/plugins/org.eclipse.rse.subsystems.processes.core/build.properties
index 99c5f2eab8a..bde64bd247c 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/build.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/build.properties
@@ -4,4 +4,3 @@ bin.includes = META-INF/,\
                plugin.properties
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF
index e1d6b88e7cc..4fc7204e1e9 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.subsystems.processes.dstore;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.processes.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/build.properties b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/build.properties
index 513e8b9ccb5..297cdc8c611 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/build.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/build.properties
@@ -6,4 +6,3 @@ bin.includes = META-INF/,\
                .
 source.. = src/
 output.. = bin/
-src.includes = build.properties
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF
index 1176b78caef..47387d1bc6a 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.subsystems.processes.local;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.processes.local.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/build.properties b/rse/plugins/org.eclipse.rse.subsystems.processes.local/build.properties
index f15dd5f0fa4..fb2d817a6ca 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/build.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/build.properties
@@ -6,4 +6,3 @@ bin.includes = META-INF/,\
                .
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF
index 3473b66574d..2ccbdd290d8 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.core
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.shells.core.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/build.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.core/build.properties
index 4e900254e78..f0ff6f5a13a 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/build.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/build.properties
@@ -4,4 +4,3 @@ bin.includes = META-INF/,\
                .
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
index 5b24f2685ec..095088c343c 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.dstore;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.shells.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/build.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/build.properties
index f15dd5f0fa4..fb2d817a6ca 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/build.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/build.properties
@@ -6,4 +6,3 @@ bin.includes = META-INF/,\
                .
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
index 84b52c0d363..9fdce58c80b 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.local;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.shells.local.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/build.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.local/build.properties
index f15dd5f0fa4..fb2d817a6ca 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/build.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/build.properties
@@ -6,4 +6,3 @@ bin.includes = META-INF/,\
                .
 source.. = src/
 output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
index 5434db60fb0..107d98ad102 100644
--- a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.ui;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.ui.RSEUIPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.ui/build.properties b/rse/plugins/org.eclipse.rse.ui/build.properties
index f22c1c642fd..46ff290ad79 100644
--- a/rse/plugins/org.eclipse.rse.ui/build.properties
+++ b/rse/plugins/org.eclipse.rse.ui/build.properties
@@ -8,7 +8,6 @@ bin.includes = HelpContexts.xml,\
                about.html,\
                META-INF/,\
                schema/
-src.includes = about.html
 output.. = bin/
 source.. = references/,\
            filters/,\