diff --git a/releng/org.eclipse.cdt.master/feature.xml b/releng/org.eclipse.cdt.master/feature.xml
index e40ebccc56c..c6ecdcbd360 100644
--- a/releng/org.eclipse.cdt.master/feature.xml
+++ b/releng/org.eclipse.cdt.master/feature.xml
@@ -121,4 +121,8 @@
id="org.eclipse.cdt.testing"
version="0.0.0"/>
+
+
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index 7ebfb95fa98..cb7f8241d8b 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -67,9 +67,8 @@ plugin@org.eclipse.cdt.sdk=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.ecli
feature@org.eclipse.cdt.sdk=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.sdk-feature
! Windows Feature
-plugin@org.eclipse.cdt.windows.build=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/windows/org.eclipse.cdt.windows.build
-plugin@org.eclipse.cdt.windows=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/windows/org.eclipse.cdt.windows
-feature@org.eclipse.cdt.windows=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/windows/org.eclipse.cdt.windows-feature
+plugin@org.eclipse.cdt.msw.build=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/windows/org.eclipse.cdt.msw.build
+feature@org.eclipse.cdt.msw=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/windows/org.eclipse.cdt.msw-feature
! GDB Hardware Debugging Feature
plugin@org.eclipse.cdt.debug.gdbjtag=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/jtag/org.eclipse.cdt.debug.gdbjtag
diff --git a/windows/org.eclipse.cdt.msw-feature/build.properties b/windows/org.eclipse.cdt.msw-feature/build.properties
index 64f93a9f0b7..c6af93f4925 100644
--- a/windows/org.eclipse.cdt.msw-feature/build.properties
+++ b/windows/org.eclipse.cdt.msw-feature/build.properties
@@ -1 +1,5 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ eclipse_update_120.jpg,\
+ epl-v10.html,\
+ feature.properties,\
+ license.html
diff --git a/windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF b/windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF
index 492bcb702be..fefb9432cf1 100644
--- a/windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF
+++ b/windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.cdt.managedbuilder.core
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: Eclipse CDT
diff --git a/windows/org.eclipse.cdt.msw.build/about.html b/windows/org.eclipse.cdt.msw.build/about.html
new file mode 100644
index 00000000000..d7c511887d6
--- /dev/null
+++ b/windows/org.eclipse.cdt.msw.build/about.html
@@ -0,0 +1,24 @@
+
+
+About
+
+
+About This Content
+
+June 22, 2007
+License
+
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at http://www.eclipse.org/legal/epl-v10.html.
+For purposes of the EPL, "Program" will mean the Content.
+
+If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at http://www.eclipse.org.
+
+
\ No newline at end of file
diff --git a/windows/org.eclipse.cdt.msw.build/build.properties b/windows/org.eclipse.cdt.msw.build/build.properties
index 30b2fc40bd8..f7540fbc534 100644
--- a/windows/org.eclipse.cdt.msw.build/build.properties
+++ b/windows/org.eclipse.cdt.msw.build/build.properties
@@ -3,4 +3,5 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties,\
- plugin.xml
+ plugin.xml,\
+ about.html