diff --git a/debug/org.eclipse.cdt.gdb-feature/feature.xml b/debug/org.eclipse.cdt.gdb-feature/feature.xml
index 01b2940d042..a41ce417256 100644
--- a/debug/org.eclipse.cdt.gdb-feature/feature.xml
+++ b/debug/org.eclipse.cdt.gdb-feature/feature.xml
@@ -3,7 +3,8 @@
       id="org.eclipse.cdt.gdb"
       label="%featureName"
       version="7.0.0.qualifier"
-      provider-name="%providerName">
+      provider-name="%providerName"
+      plugin="org.eclipse.cdt.gdb">
 
    <description>
       %description
diff --git a/debug/org.eclipse.cdt.gdb/about.ini b/debug/org.eclipse.cdt.gdb/about.ini
new file mode 100644
index 00000000000..2411cc21096
--- /dev/null
+++ b/debug/org.eclipse.cdt.gdb/about.ini
@@ -0,0 +1,24 @@
+# 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=cdt_logo_icon32.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
diff --git a/debug/org.eclipse.cdt.gdb/about.mappings b/debug/org.eclipse.cdt.gdb/about.mappings
new file mode 100644
index 00000000000..c39de2d7fe5
--- /dev/null
+++ b/debug/org.eclipse.cdt.gdb/about.mappings
@@ -0,0 +1,9 @@
+# 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.
+
+# The following should contain the build version.
+# e.g. "0=20020612"
+# This value will be added automaticaly via the build scripts
+0=@build@
\ No newline at end of file
diff --git a/debug/org.eclipse.cdt.gdb/about.properties b/debug/org.eclipse.cdt.gdb/about.properties
new file mode 100644
index 00000000000..6b3640f628f
--- /dev/null
+++ b/debug/org.eclipse.cdt.gdb/about.properties
@@ -0,0 +1,25 @@
+###############################################################################
+#  Copyright (c) 2002, 2008 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
+###############################################################################
+# about.properties
+# contains externalized strings for about.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# fill-ins are supplied by about.mappings
+# This file should be translated.
+# NOTE TO TRANSLATOR: Please do not translate the featureVersion variable.
+
+
+blurb=GDB Common\n\
+\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+(c) Copyright Eclipse contributors and others, 2000, 2010.  All rights reserved.\n\
+Visit http://www.eclipse.org/cdt
diff --git a/debug/org.eclipse.cdt.gdb/cdt_logo_icon32.png b/debug/org.eclipse.cdt.gdb/cdt_logo_icon32.png
new file mode 100644
index 00000000000..b6767c03863
Binary files /dev/null and b/debug/org.eclipse.cdt.gdb/cdt_logo_icon32.png differ
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/build.properties b/lrparser/org.eclipse.cdt.core.lrparser/build.properties
index b1a19e8d27f..5517c9e06ba 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/build.properties
+++ b/lrparser/org.eclipse.cdt.core.lrparser/build.properties
@@ -15,8 +15,8 @@ bin.includes = META-INF/,\
                about.html,\
                plugin.properties,\
                plugin.xml,\
-               eclipse32.gif,\
                about.ini,\
                about.mappings,\
-               about.properties
+               about.properties,\
+               cdt_logo_icon32.png
 src.includes = about.html
diff --git a/releng/org.eclipse.cdt/cdt_logo_icon32.gif b/releng/org.eclipse.cdt/cdt_logo_icon32.gif
deleted file mode 100644
index 8504cd7770f..00000000000
Binary files a/releng/org.eclipse.cdt/cdt_logo_icon32.gif and /dev/null differ
diff --git a/upc/org.eclipse.cdt.core.parser.upc/build.properties b/upc/org.eclipse.cdt.core.parser.upc/build.properties
index 4dd55390af9..63a74327ee8 100644
--- a/upc/org.eclipse.cdt.core.parser.upc/build.properties
+++ b/upc/org.eclipse.cdt.core.parser.upc/build.properties
@@ -18,6 +18,6 @@ bin.includes = META-INF/,\
                about.ini,\
                about.mappings,\
                about.properties,\
-               eclipse32.gif,\
-               templates/
+               templates/,\
+               cdt_logo_icon32.png
 src.includes = about.html
diff --git a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/about.ini b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/about.ini
new file mode 100644
index 00000000000..e07a7bb377e
--- /dev/null
+++ b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/about.ini
@@ -0,0 +1,24 @@
+# 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=cdt_logo_icon32.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
diff --git a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/about.mappings b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/about.mappings
new file mode 100644
index 00000000000..0824105e69d
--- /dev/null
+++ b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/about.mappings
@@ -0,0 +1,9 @@
+# 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.
+
+# The following should contain the build version.
+# e.g. "0=20020612"
+# This value will be added automaticaly via the build scripts
+0=@build@
\ No newline at end of file
diff --git a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/about.properties b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/about.properties
new file mode 100644
index 00000000000..54f06d8ced8
--- /dev/null
+++ b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/about.properties
@@ -0,0 +1,25 @@
+###############################################################################
+# Copyright (c) 2007 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
+###############################################################################
+# about.properties
+# contains externalized strings for about.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# fill-ins are supplied by about.mappings
+# This file should be translated.
+# NOTE TO TRANSLATOR: Please do not translate the featureVersion variable.
+
+
+blurb=Berkeley UPC Tool Chain\n\
+\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+(c) Copyright Eclipse contributors and others, 2007, 2010.  All rights reserved.\n\
+Visit http://www.eclipse.org/cdt
diff --git a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/build.properties b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/build.properties
index 72de7a06bc0..420fa3b9608 100644
--- a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/build.properties
+++ b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/build.properties
@@ -6,4 +6,8 @@ bin.includes = META-INF/,\
                templates/,\
                build.properties,\
                about.html,\
-               plugin.properties
+               plugin.properties,\
+               cdt_logo_icon32.png,\
+               about.ini,\
+               about.mappings,\
+               about.properties
diff --git a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/cdt_logo_icon32.png b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/cdt_logo_icon32.png
new file mode 100644
index 00000000000..b6767c03863
Binary files /dev/null and b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/cdt_logo_icon32.png differ
diff --git a/util/org.eclipse.cdt.util/build.properties b/util/org.eclipse.cdt.util/build.properties
index f02dcc76e07..e19559de86d 100644
--- a/util/org.eclipse.cdt.util/build.properties
+++ b/util/org.eclipse.cdt.util/build.properties
@@ -11,13 +11,13 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-			   .,\
+               .,\
                about.html,\
                about.ini,\
                about.mappings,\
                about.properties,\
-               eclipse32.gif,\
                notice.html,\
                plugin.properties,\
-               epl-v10.html
+               epl-v10.html,\
+               cdt_logo_icon32.png
 src.includes = about.html