diff --git a/assembly/features/org.eclipse.jst.feature/feature.properties b/assembly/features/org.eclipse.jst.feature/feature.properties
index 0293c8d0b12886d2748114919671e23e4bb6851e..c0eded4d0a662020d584d09a3b2710fc1d390308 100644
--- a/assembly/features/org.eclipse.jst.feature/feature.properties
+++ b/assembly/features/org.eclipse.jst.feature/feature.properties
@@ -17,7 +17,8 @@
 # "featureName" property - name of the feature
 featureName=J2EE Standard Tools (JST) Project
 optionalFeatureName=Web Page Editor (Optional)
-optionalJSFToolsFeatureName=WTP Web Page Editor Apache MyFaces Trinidad Tag Support (optional)
+optionalJSFToolsFeatureName=WTP Web Page Editor Apache MyFaces Trinidad Tag Support (Optional)
+optionalAxis2FeatureName=WTP Axis2 Tools (Optional)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
diff --git a/assembly/features/org.eclipse.jst.feature/feature.xml b/assembly/features/org.eclipse.jst.feature/feature.xml
index cb6caf4ba97689b2b70c3988fcc85d362d3dd987..1e3909923cc2955e07e322d29aca50e3eba86778 100644
--- a/assembly/features/org.eclipse.jst.feature/feature.xml
+++ b/assembly/features/org.eclipse.jst.feature/feature.xml
@@ -56,6 +56,12 @@
          name="%optionalJSFToolsFeatureName"
          optional="true"/>
 
+   <includes 
+         id="org.eclipse.jst.ws.axis2tools.feature"
+         version="0.0.0"
+         name="%optionalAxis2FeatureName"
+         optional="true"/>
+
    <plugin
          id="org.eclipse.jst"
          download-size="0"
diff --git a/assembly/features/org.eclipse.jst.sdk/feature.xml b/assembly/features/org.eclipse.jst.sdk/feature.xml
index 16957ab7e83f6ef76e83eb20f16a511deeada9c6..0953eaa942b4cd7ffc063b16d2675ac9e6376a94 100644
--- a/assembly/features/org.eclipse.jst.sdk/feature.xml
+++ b/assembly/features/org.eclipse.jst.sdk/feature.xml
@@ -51,6 +51,11 @@
          optional="true"
          id="org.eclipse.jst.webpageeditor_sdk.feature"
          version="0.0.0" />
+         
+   <includes
+         optional="true"
+         id="org.eclipse.jst.ws.axis2tools_sdk.feature"
+         version="0.0.0" />
 
 	<!-- technically, this last org.eclipse.jst feature include is not needed for the build or packaging, 
 		but, it helps update manager behave more as expected (that is, it can filter out org.eclipse.wst