diff --git a/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF
index a238bc8a7ca..1ee36ed73f0 100644
--- a/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %fragmentName.aix
 Bundle-SymbolicName: org.eclipse.cdt.core.aix; singleton:=true
 Bundle-Version: 5.1.1.qualifier
-Bundle-ClassPath: cdtaix.jar
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)"
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.aix/build.properties b/core/org.eclipse.cdt.core.aix/build.properties
index 1c593888d45..4cc40daacc3 100644
--- a/core/org.eclipse.cdt.core.aix/build.properties
+++ b/core/org.eclipse.cdt.core.aix/build.properties
@@ -13,6 +13,7 @@ bin.includes = fragment.xml,\
                .,\
                about.html,\
                META-INF/,\
-               os/
+               os/,\
+               plugin.properties
 src.includes = library/,\
                about.html
diff --git a/core/org.eclipse.cdt.core.aix/cdtaix.jar b/core/org.eclipse.cdt.core.aix/cdtaix.jar
deleted file mode 100644
index ed750248701..00000000000
Binary files a/core/org.eclipse.cdt.core.aix/cdtaix.jar and /dev/null differ
diff --git a/core/org.eclipse.cdt.core.aix/plugin.properties b/core/org.eclipse.cdt.core.aix/plugin.properties
new file mode 100644
index 00000000000..a7caa474ef7
--- /dev/null
+++ b/core/org.eclipse.cdt.core.aix/plugin.properties
@@ -0,0 +1,2 @@
+fragmentName.linux=C/C++ Development Tools Core for AIX
+providerName=Eclipse CDT
diff --git a/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF
index 80e45316a4e..b8c60b0b498 100644
--- a/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %fragmentName.linux
 Bundle-SymbolicName: org.eclipse.cdt.core.linux; singleton:=true
 Bundle-Version: 5.2.0.qualifier
-Bundle-ClassPath: cdt_linux.jar
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.cdt.core;bundle-version="[5.2.0,6.0.0)"
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.linux/build.properties b/core/org.eclipse.cdt.core.linux/build.properties
index 6542e91cbdf..cfcc7204fc7 100644
--- a/core/org.eclipse.cdt.core.linux/build.properties
+++ b/core/org.eclipse.cdt.core.linux/build.properties
@@ -11,7 +11,8 @@
 bin.includes = fragment.xml,\
                about.html,\
                .,\
-               META-INF/
+               META-INF/,\
+               plugin.properties
 src.includes = about.html,\
                library/
 source.. = src/
diff --git a/core/org.eclipse.cdt.core.linux/cdt_linux.jar b/core/org.eclipse.cdt.core.linux/cdt_linux.jar
deleted file mode 100644
index d52f913efb2..00000000000
Binary files a/core/org.eclipse.cdt.core.linux/cdt_linux.jar and /dev/null differ
diff --git a/core/org.eclipse.cdt.core.linux/plugin.properties b/core/org.eclipse.cdt.core.linux/plugin.properties
new file mode 100644
index 00000000000..6c8e47ac7e1
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux/plugin.properties
@@ -0,0 +1,2 @@
+fragmentName.linux=C/C++ Development Tools Core for Linux
+providerName=Eclipse CDT
diff --git a/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF
index 9391a5985ab..448544e2327 100644
--- a/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %fragmentName.macosx
 Bundle-SymbolicName: org.eclipse.cdt.core.macosx; singleton:=true
 Bundle-Version: 5.2.0.qualifier
-Bundle-ClassPath: cdt_macosx.jar
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.cdt.core;bundle-version="[5.2.0,6.0.0)"
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.macosx/build.properties b/core/org.eclipse.cdt.core.macosx/build.properties
index fc76b9bff0c..72726d4a8ce 100644
--- a/core/org.eclipse.cdt.core.macosx/build.properties
+++ b/core/org.eclipse.cdt.core.macosx/build.properties
@@ -12,7 +12,8 @@ bin.includes = fragment.xml,\
                about.html,\
                .,\
                os/,\
-               META-INF/
+               META-INF/,\
+               plugin.properties
 src.includes = about.html,\
                library/
 source.. = src/
diff --git a/core/org.eclipse.cdt.core.macosx/cdt_macosx.jar b/core/org.eclipse.cdt.core.macosx/cdt_macosx.jar
deleted file mode 100644
index 99d684f11a0..00000000000
Binary files a/core/org.eclipse.cdt.core.macosx/cdt_macosx.jar and /dev/null differ
diff --git a/core/org.eclipse.cdt.core.macosx/plugin.properties b/core/org.eclipse.cdt.core.macosx/plugin.properties
new file mode 100644
index 00000000000..dda4771c596
--- /dev/null
+++ b/core/org.eclipse.cdt.core.macosx/plugin.properties
@@ -0,0 +1,2 @@
+fragmentName.linux=C/C++ Development Tools Core for Mac OS X
+providerName=Eclipse CDT
diff --git a/core/org.eclipse.cdt.core.solaris/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.solaris/META-INF/MANIFEST.MF
index 92d3b1e3cf1..9fd313a9c02 100644
--- a/core/org.eclipse.cdt.core.solaris/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.solaris/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %fragmentName.solaris
 Bundle-SymbolicName: org.eclipse.cdt.core.solaris; singleton:=true
 Bundle-Version: 5.2.0.qualifier
-Bundle-ClassPath: cdt_solaris.jar
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.cdt.core;bundle-version="[5.2.0,6.0.0)"
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.solaris/build.properties b/core/org.eclipse.cdt.core.solaris/build.properties
index 682baefa984..4b121c5dec2 100644
--- a/core/org.eclipse.cdt.core.solaris/build.properties
+++ b/core/org.eclipse.cdt.core.solaris/build.properties
@@ -12,7 +12,8 @@ bin.includes = fragment.xml,\
                about.html,\
                os/,\
                .,\
-               META-INF/
+               META-INF/,\
+               plugin.properties
 src.includes = about.html,\
                library/
 source.. = src/
diff --git a/core/org.eclipse.cdt.core.solaris/cdt_solaris.jar b/core/org.eclipse.cdt.core.solaris/cdt_solaris.jar
deleted file mode 100644
index 5b7ad3f5649..00000000000
Binary files a/core/org.eclipse.cdt.core.solaris/cdt_solaris.jar and /dev/null differ
diff --git a/core/org.eclipse.cdt.core.solaris/plugin.properties b/core/org.eclipse.cdt.core.solaris/plugin.properties
new file mode 100644
index 00000000000..6b680ec07d0
--- /dev/null
+++ b/core/org.eclipse.cdt.core.solaris/plugin.properties
@@ -0,0 +1,2 @@
+fragmentName.linux=C/C++ Development Tools Core for Solaris
+providerName=Eclipse CDT
diff --git a/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF
index e8227526a50..e1f24800250 100644
--- a/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %fragmentName.win32
 Bundle-SymbolicName: org.eclipse.cdt.core.win32; singleton:=true
 Bundle-Version: 5.3.0.qualifier
-Bundle-ClassPath: cdt_win32.jar
 Bundle-Vendor: %providerName
 Fragment-Host: org.eclipse.cdt.core;bundle-version="[5.2.0,6.0.0)"
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.win32/build.properties b/core/org.eclipse.cdt.core.win32/build.properties
index 3805517ebdd..5afcaa0bc45 100644
--- a/core/org.eclipse.cdt.core.win32/build.properties
+++ b/core/org.eclipse.cdt.core.win32/build.properties
@@ -11,7 +11,8 @@
 bin.includes = fragment.xml,\
                about.html,\
                .,\
-               META-INF/
+               META-INF/,\
+               plugin.properties
 src.includes = about.html,\
                library/
 source.. = src/
diff --git a/core/org.eclipse.cdt.core.win32/cdt_win32.jar b/core/org.eclipse.cdt.core.win32/cdt_win32.jar
deleted file mode 100644
index ba72d9299ed..00000000000
Binary files a/core/org.eclipse.cdt.core.win32/cdt_win32.jar and /dev/null differ
diff --git a/core/org.eclipse.cdt.core.win32/plugin.properties b/core/org.eclipse.cdt.core.win32/plugin.properties
new file mode 100644
index 00000000000..0b31b3ca94e
--- /dev/null
+++ b/core/org.eclipse.cdt.core.win32/plugin.properties
@@ -0,0 +1,2 @@
+fragmentName.linux=C/C++ Development Tools Core for Windows
+providerName=Eclipse CDT