diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
index 330c20e9c70..1c3af369bee 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
@@ -33,6 +33,10 @@
          id="org.apache.commons_net"
          version="0.0.0"/>
 
+   <includes
+         id="org.apache.oro"
+         version="0.0.0"/>
+
    <plugin
          id="org.eclipse.rse.services.files.ftp"
          download-size="0"
diff --git a/rse/features/org.eclipse.rse.sdk-feature/build.properties b/rse/features/org.eclipse.rse.sdk-feature/build.properties
index 96cf4b69025..dbb3ce4155c 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/build.properties
+++ b/rse/features/org.eclipse.rse.sdk-feature/build.properties
@@ -1,18 +1,19 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# 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
-###############################################################################
+################################################################################
+# Copyright (c) 2006 Wind River Systems, Inc.
+# 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: 
+# Martin Oberhuber - initial API and implementation 
+################################################################################
 bin.includes = feature.xml,\
                license.html,\
                feature.properties,\
                epl-v10.html
 generate.feature@org.apache.commons_net.source=org.apache.commons_net
+generate.feature@org.apache.oro.source=org.apache.oro
 generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
 generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
 generate.feature@org.eclipse.rse.remotecdt.source=org.eclipse.rse.remotecdt
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
index c81a1949f2d..83645e36f06 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
@@ -3,7 +3,8 @@
       id="org.eclipse.rse.sdk"
       label="%featureName"
       version="1.0.0.qualifier"
-      provider-name="%providerName">
+      provider-name="%providerName"
+      plugin="org.eclipse.rse.sdk">
 
    <description>
       %description
@@ -18,12 +19,6 @@
       <discovery label="%updateSiteName" url="http://download.eclipse.org/dsdp/tm/updates"/>
    </url>
 
-   <!--
-   <includes
-         id="org.apache.commons_net"
-         version="0.0.0"/>
-   -->
-
    <includes
          id="org.eclipse.rse.core"
          version="0.0.0"/>
@@ -54,6 +49,10 @@
          id="org.apache.commons_net.source"
          version="0.0.0"/>
 
+   <includes
+         id="org.apache.oro.source"
+         version="0.0.0"/>
+
    <includes
          id="org.eclipse.rse.core.source"
          version="0.0.0"/>
diff --git a/rse/plugins/org.eclipse.rse.sdk/about.properties b/rse/plugins/org.eclipse.rse.sdk/about.properties
index 9deedbfedbf..7ff8e9bfa52 100644
--- a/rse/plugins/org.eclipse.rse.sdk/about.properties
+++ b/rse/plugins/org.eclipse.rse.sdk/about.properties
@@ -1,13 +1,13 @@
-###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
-# 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
-###############################################################################
+################################################################################
+# Copyright (c) 2006 Wind River Systems, Inc.
+# 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: 
+# Martin Oberhuber - initial API and implementation 
+################################################################################
 # about.properties
 # contains externalized strings for about.ini
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
@@ -22,4 +22,7 @@ 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
\ No newline at end of file
+Visit http://www.eclipse.org/dsdp/tm\n\
+\n\
+This product includes software developed by the\n\
+Apache Software Foundation http://www.apache.org/
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 20b529f0154..dd92277cf5f 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/about.properties
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/about.properties
@@ -1,13 +1,13 @@
-###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
-# 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
-###############################################################################
+################################################################################
+# Copyright (c) 2006 Wind River Systems, Inc.
+# 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: 
+# Martin Oberhuber - initial API and implementation 
+################################################################################
 # about.properties
 # contains externalized strings for about.ini
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
@@ -22,4 +22,7 @@ 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
\ No newline at end of file
+Visit http://www.eclipse.org/dsdp/tm\n\
+\n\
+This product includes software developed by the\n\
+Apache Software Foundation http://www.apache.org/