diff --git a/assembly/features/org.eclipse.jst.feature/feature.properties b/assembly/features/org.eclipse.jst.feature/feature.properties
index fb2a7c7210f04f9ac9c375a0c83b551fd33e55d4..0293c8d0b12886d2748114919671e23e4bb6851e 100644
--- a/assembly/features/org.eclipse.jst.feature/feature.properties
+++ b/assembly/features/org.eclipse.jst.feature/feature.properties
@@ -17,6 +17,7 @@
 # "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)
 
 # "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 cc1dd8d8ff1a4f81436a26f89a59ac9383b902f7..cb6caf4ba97689b2b70c3988fcc85d362d3dd987 100644
--- a/assembly/features/org.eclipse.jst.feature/feature.xml
+++ b/assembly/features/org.eclipse.jst.feature/feature.xml
@@ -45,10 +45,16 @@
          version="0.0.0"/>
 
    <includes
-         optional="true"
          id="org.eclipse.jst.webpageeditor.feature"
          version="0.0.0"
-         name="%optionalFeatureName" />
+         name="%optionalFeatureName"
+         optional="true"/>
+
+   <includes
+         id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
+         version="0.0.0"
+         name="%optionalJSFToolsFeatureName"
+         optional="true"/>
 
    <plugin
          id="org.eclipse.jst"