License, branding
diff --git a/org.eclipse.jsf/features/org.eclipse.jst.jsf.facelet.feature/feature.properties b/org.eclipse.jsf/features/org.eclipse.jst.jsf.facelet.feature/feature.properties
index 12160f2..9065185 100644
--- a/org.eclipse.jsf/features/org.eclipse.jst.jsf.facelet.feature/feature.properties
+++ b/org.eclipse.jsf/features/org.eclipse.jst.jsf.facelet.feature/feature.properties
@@ -8,9 +8,9 @@
 # Contributors:
 #    Cameron Bateman - initial API and implementation
 ###############################################################################
-feature.name=JSF Facelets Tools Incubator
-feature.provider=Eclipse.org
-feature.description=WTP JSF Facelets Tooling Incubator
+featureName=JSF Facelets Tools Incubator
+featureProvider=Eclipse.org
+featureDescription=WTP JSF Facelets Tooling Incubator
 
 # "copyright" property - text of the "Feature Update Copyright"
 feature.copyright=\
diff --git a/org.eclipse.jsf/features/org.eclipse.jst.jsf.facelet.feature/feature.xml b/org.eclipse.jsf/features/org.eclipse.jst.jsf.facelet.feature/feature.xml
index 5718b50..b02a8e2 100644
--- a/org.eclipse.jsf/features/org.eclipse.jst.jsf.facelet.feature/feature.xml
+++ b/org.eclipse.jsf/features/org.eclipse.jst.jsf.facelet.feature/feature.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.jst.jsf.facelet.feature"
-      label="%feature.name"
+      label="%featureName"
       version="0.1.0.qualifier"
-      provider-name="%feature.provider">
+      provider-name="%featureProvider"
+      plugin="org.eclipse.jst.jsf.facelet.core">
 
    <description>
-      %feature.description
+      %featureDescription
    </description>
 
    <copyright>
diff --git a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/META-INF/MANIFEST.MF b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/META-INF/MANIFEST.MF
index b60b9a1..360cb1e 100644
--- a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.jsf.facelet.core;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 0.1.0.qualifier
 Bundle-Activator: org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin$Implementation
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
@@ -58,3 +58,4 @@
  org.eclipse.jst.jsf.facelet.core.internal.util;x-internal:=true,
  org.eclipse.jst.jsf.facelet.core.internal.validation;x-internal:=true,
  org.eclipse.jst.jsf.facelet.core.internal.view;x-internal:=true
+Bundle-Vendor: %providerName
diff --git a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/about.ini b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/about.ini
new file mode 100644
index 0000000..c9af85c
--- /dev/null
+++ b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/about.ini
@@ -0,0 +1,2 @@
+aboutText = %aboutText
+featureImage = eclipse_update_120.jpg
\ No newline at end of file
diff --git a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/about.properties b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/about.properties
new file mode 100644
index 0000000..477e2f8
--- /dev/null
+++ b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/about.properties
@@ -0,0 +1,6 @@
+aboutText=JSF Facelets Tools - WTP Incubator Project\n\
+\n\
+Version: 0.1.0\n\
+\n\
+(c) Copyright Eclipse contributors and others 2008.  All rights reserved. \n\
+Visit http://www.eclipse.org/webtools
\ No newline at end of file
diff --git a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/build.properties b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/build.properties
index 47d4c48..d75d69e 100644
--- a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/build.properties
+++ b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/build.properties
@@ -7,4 +7,8 @@
                plugin.properties,\
                dtd/,\
                icons/,\
-               model/
+               model/,\
+               about.ini,\
+               about.properties,\
+               eclipse_update_120.jpg,\
+               about.html
diff --git a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/eclipse_update_120.jpg b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/eclipse_update_120.jpg
new file mode 100644
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/plugin.properties b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/plugin.properties
index acce93c..c6957e6 100644
--- a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/plugin.properties
+++ b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.core/plugin.properties
@@ -3,10 +3,10 @@
 Facelet_1_0_Project=Facelet 1.0 Project
 Facelet_1_0_PresetDesc=Configures a Dynamic Web application for Facelet 1.0, JSF v1.2 using Web Module v2.5 and Java v1.5.  
 
-Bundle-Name.0 = JSF Facelets Core Plugin
+Bundle-Name.0 = JSF Facelets Tools - WTP Incubator Project
 tagRegistry.description.0 = Facelet Tag Registry
 pluginName = AdditionalTagMetadata Model
-providerName = www.example.org
+providerName = Eclipse.org
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
 _UI_CreateChild_text3 = {1}
diff --git a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.tagsupport/META-INF/MANIFEST.MF b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.tagsupport/META-INF/MANIFEST.MF
index d0905c1..4893ddc 100644
--- a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.tagsupport/META-INF/MANIFEST.MF
+++ b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.tagsupport/META-INF/MANIFEST.MF
@@ -1,11 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Tagsupport Plug-in
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.jsf.facelet.tagsupport;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 0.1.0.qualifier
 Bundle-Activator: org.eclipse.jst.jsf.facelet.tagsupport.TagSupportPlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jst.jsf.common;bundle-version="1.1.0",
- org.eclipse.jst.jsf.facelet.core;bundle-version="1.0.0"
+ org.eclipse.jst.jsf.facelet.core;bundle-version="0.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Localization: plugin
diff --git a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.tagsupport/build.properties b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.tagsupport/build.properties
index ac474f5..5bf9a86 100644
--- a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.tagsupport/build.properties
+++ b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.tagsupport/build.properties
@@ -3,4 +3,5 @@
 bin.includes = META-INF/,\
                .,\
                metadata/,\
-               plugin.xml
+               plugin.xml,\
+               plugin.properties
diff --git a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.tagsupport/plugin.properties b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.tagsupport/plugin.properties
new file mode 100644
index 0000000..19ffe60
--- /dev/null
+++ b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.tagsupport/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.jst.jsf.facelet.tagsupport
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Name.0 = Tagsupport Plug-in
\ No newline at end of file
diff --git a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.ui/META-INF/MANIFEST.MF b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.ui/META-INF/MANIFEST.MF
index d6c2da6..9c365a5 100644
--- a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.jsf.facelet.ui;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 0.1.0.qualifier
 Bundle-Activator: org.eclipse.jst.jsf.facelet.ui.internal.FaceletUiPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -16,7 +16,7 @@
  org.eclipse.wst.xml.core;bundle-version="1.1.300",
  org.eclipse.jst.jsf.common;bundle-version="1.0.1",
  org.eclipse.core.resources;bundle-version="3.4.0",
- org.eclipse.jst.jsf.facelet.core;bundle-version="1.0.0",
+ org.eclipse.jst.jsf.facelet.core;bundle-version="0.1.0",
  org.eclipse.jst.jsf.core;bundle-version="1.0.1",
  org.eclipse.jst.jsf.common.runtime;bundle-version="1.0.0",
  org.eclipse.wst.validation;bundle-version="1.1.103",
@@ -37,3 +37,4 @@
  org.eclipse.jst.jsf.facelet.ui.internal.facet;x-internal:=true,
  org.eclipse.jst.jsf.facelet.ui.internal.hover;x-internal:=true,
  org.eclipse.jst.jsf.facelet.ui.internal.validation;x-internal:=true
+Bundle-Vendor: %Bundle-Vendor.0
diff --git a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.ui/plugin.properties b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.ui/plugin.properties
index 4d5474d..21fb12e 100644
--- a/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.ui/plugin.properties
+++ b/org.eclipse.jsf/plugins/org.eclipse.jst.jsf.facelet.ui/plugin.properties
@@ -1,4 +1,5 @@
 FaceletHTMLValidator_name=Facelet HTML Validator
 EL_Hyperlinkdetector_name=Facelet EL Hyperlink Detector
 FaceletValidatorMarker=Facelet Validator
-Bundle-Name.0 = Ui Plug-in
\ No newline at end of file
+Bundle-Name.0 = UI Plug-in
+Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file