diff --git a/bundles/org.eclipse.rap.rwt.custom.demo/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.rwt.custom.demo/META-INF/MANIFEST.MF
index 842b380..28784cb 100644
--- a/bundles/org.eclipse.rap.rwt.custom.demo/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.rwt.custom.demo/META-INF/MANIFEST.MF
@@ -1,6 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Demo
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.rap.rwt.custom.demo;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Require-Bundle: org.eclipse.rap.ui;bundle-version="1.3.0",
diff --git a/bundles/org.eclipse.rap.rwt.custom.demo/about.html b/bundles/org.eclipse.rap.rwt.custom.demo/about.html
new file mode 100644
index 0000000..c258ef5
--- /dev/null
+++ b/bundles/org.eclipse.rap.rwt.custom.demo/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) 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 <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.rap.rwt.custom.demo/build.properties b/bundles/org.eclipse.rap.rwt.custom.demo/build.properties
index e4addeb..80f44d8 100644
--- a/bundles/org.eclipse.rap.rwt.custom.demo/build.properties
+++ b/bundles/org.eclipse.rap.rwt.custom.demo/build.properties
@@ -3,4 +3,7 @@
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               theme/
+               theme/,\
+               plugin.properties,\
+               about.html
+src.includes = about.html
diff --git a/bundles/org.eclipse.rap.rwt.custom.demo/plugin.properties b/bundles/org.eclipse.rap.rwt.custom.demo/plugin.properties
new file mode 100644
index 0000000..ef1f6e8
--- /dev/null
+++ b/bundles/org.eclipse.rap.rwt.custom.demo/plugin.properties
@@ -0,0 +1,3 @@
+
+Bundle-Name = RWT Spreadsheet Widget Demo (Incubation)
+Bundle-Vendor = Eclipse.org - RAP Incubator
diff --git a/bundles/org.eclipse.rap.rwt.custom/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.rwt.custom/META-INF/MANIFEST.MF
index 7f29cd4..a0f7ff8 100644
--- a/bundles/org.eclipse.rap.rwt.custom/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.rwt.custom/META-INF/MANIFEST.MF
@@ -7,3 +7,4 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Export-Package: org.eclipse.swt.custom
 Require-Bundle: org.eclipse.rap.rwt;bundle-version="1.3.0"
+Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.rap.rwt.custom/about.html b/bundles/org.eclipse.rap.rwt.custom/about.html
index 248f88c..c258ef5 100644
--- a/bundles/org.eclipse.rap.rwt.custom/about.html
+++ b/bundles/org.eclipse.rap.rwt.custom/about.html
@@ -8,7 +8,7 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>August 08, 2009</p>	
+<p>June 5, 2006</p>	
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
@@ -25,4 +25,4 @@
 and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.rap.rwt.custom/build.properties b/bundles/org.eclipse.rap.rwt.custom/build.properties
index 34d2e4d..2b112c4 100644
--- a/bundles/org.eclipse.rap.rwt.custom/build.properties
+++ b/bundles/org.eclipse.rap.rwt.custom/build.properties
@@ -1,4 +1,7 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               plugin.properties,\
+               about.html
+src.includes = about.html
diff --git a/bundles/org.eclipse.rap.rwt.custom/plugin.properties b/bundles/org.eclipse.rap.rwt.custom/plugin.properties
index 7ac0385..6219c1e 100644
--- a/bundles/org.eclipse.rap.rwt.custom/plugin.properties
+++ b/bundles/org.eclipse.rap.rwt.custom/plugin.properties
@@ -1,3 +1,3 @@
 
-Bundle-Name = RWT Custom
-Bundle-Vendor = Eclipse.org - RAP
+Bundle-Name = RWT Spreadsheet Widget (Incubation)
+Bundle-Vendor = Eclipse.org - RAP Incubator
diff --git a/tests/org.eclipse.rap.rwt.custom.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.rwt.custom.test/META-INF/MANIFEST.MF
index 30f327c..998b2c1 100644
--- a/tests/org.eclipse.rap.rwt.custom.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.rwt.custom.test/META-INF/MANIFEST.MF
@@ -1,8 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Test
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.rap.rwt.custom.test
 Bundle-Version: 0.0.0.qualifier
 Fragment-Host: org.eclipse.rap.rwt.custom;bundle-version="0.0.0.qualifier"
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Require-Bundle: org.junit;bundle-version="3.8.2"
+Bundle-Localization: plugin
diff --git a/tests/org.eclipse.rap.rwt.custom.test/about.html b/tests/org.eclipse.rap.rwt.custom.test/about.html
index 248f88c..c258ef5 100644
--- a/tests/org.eclipse.rap.rwt.custom.test/about.html
+++ b/tests/org.eclipse.rap.rwt.custom.test/about.html
@@ -8,7 +8,7 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>August 08, 2009</p>	
+<p>June 5, 2006</p>	
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
@@ -25,4 +25,4 @@
 and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.rap.rwt.custom.test/build.properties b/tests/org.eclipse.rap.rwt.custom.test/build.properties
index 34d2e4d..cdd2db7 100644
--- a/tests/org.eclipse.rap.rwt.custom.test/build.properties
+++ b/tests/org.eclipse.rap.rwt.custom.test/build.properties
@@ -1,4 +1,7 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               about.html,\
+               plugin.properties
+src.includes = about.html
diff --git a/tests/org.eclipse.rap.rwt.custom.test/plugin.properties b/tests/org.eclipse.rap.rwt.custom.test/plugin.properties
new file mode 100644
index 0000000..51df9f6
--- /dev/null
+++ b/tests/org.eclipse.rap.rwt.custom.test/plugin.properties
@@ -0,0 +1,3 @@
+
+Bundle-Name = Tests for RWT Spreadsheet Widget (Incubation)
+Bundle-Vendor = Eclipse.org - RAP Incubator