232717 Optional features should be listed separately
diff --git a/features/org.eclipse.jst.ws.axis2tools.feature/build.properties b/features/org.eclipse.jst.ws.axis2tools.feature/build.properties
index 64f93a9..01b0213 100644
--- a/features/org.eclipse.jst.ws.axis2tools.feature/build.properties
+++ b/features/org.eclipse.jst.ws.axis2tools.feature/build.properties
@@ -1 +1,5 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg,\
+               license.html
diff --git a/features/org.eclipse.jst.ws.axis2tools.feature/feature.properties b/features/org.eclipse.jst.ws.axis2tools.feature/feature.properties
index 97ce466..09c7aed 100644
--- a/features/org.eclipse.jst.ws.axis2tools.feature/feature.properties
+++ b/features/org.eclipse.jst.ws.axis2tools.feature/feature.properties
@@ -15,7 +15,7 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=WTP Axis2 Tools
+featureName=Axis2 Tools (Optional)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
@@ -24,7 +24,7 @@
 updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
 
 # "description" property - description of the feature
-description=Web Tools Platform (WTP) Axis2 Tools
+description=Axis2 Tools (Optional)
 
 # "copyright" property - text of the "Feature Update Copyright"
 feature.copyright=\
diff --git a/features/org.eclipse.jst.ws.axis2tools.feature/feature.xml b/features/org.eclipse.jst.ws.axis2tools.feature/feature.xml
index f1ec0f0..83d3789 100644
--- a/features/org.eclipse.jst.ws.axis2tools.feature/feature.xml
+++ b/features/org.eclipse.jst.ws.axis2tools.feature/feature.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.jst.ws.axis2tools.feature"
-      label="Axis2 Tools"
+      label="%featureName"
       version="1.0.0.qualifier"
-      provider-name="Eclipse.org">
+      provider-name="%providerName"
+      plugin="org.eclipse.jst"
+      image="eclipse_update_120.jpg">
 
    <description>
       %description