diff --git a/assembly/features/org.eclipse.jst.feature/feature.properties b/assembly/features/org.eclipse.jst.feature/feature.properties
index bc892b7c1b2900eb13f4e70ac44dd78d310a33c3..fb2a7c7210f04f9ac9c375a0c83b551fd33e55d4 100644
--- a/assembly/features/org.eclipse.jst.feature/feature.properties
+++ b/assembly/features/org.eclipse.jst.feature/feature.properties
@@ -16,6 +16,7 @@
 
 # "featureName" property - name of the feature
 featureName=J2EE Standard Tools (JST) Project
+optionalFeatureName=Web Page Editor (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 1c2f278702fd2637cec2bc2fad39e778d93c8229..4036469be9ff73a65329fbe11e8e3e37844dbeca 100644
--- a/assembly/features/org.eclipse.jst.feature/feature.xml
+++ b/assembly/features/org.eclipse.jst.feature/feature.xml
@@ -45,10 +45,10 @@
          version="0.0.0"/>
 
    <includes
+         optional="true"
          id="org.eclipse.jst.webpageeditor.feature"
          version="0.0.0"
-         name="Web Page Editor (Optional)"
-         optional="true"/>
+         name="%optionalFeatureName" />
 
    <plugin
          id="org.eclipse.jst"
diff --git a/features/org.eclipse.wtp.releng.tests.feature/build.properties b/features/org.eclipse.wtp.releng.tests.feature/build.properties
index 64f93a9f0b7328eb563aa5ad6cec7f828020e124..52c3cfc4864fd071f03e7a882982cfe74461505f 100644
--- a/features/org.eclipse.wtp.releng.tests.feature/build.properties
+++ b/features/org.eclipse.wtp.releng.tests.feature/build.properties
@@ -1 +1,3 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+               license.html,\
+               feature.properties
diff --git a/features/org.eclipse.wtp.releng.tests.feature/feature.xml b/features/org.eclipse.wtp.releng.tests.feature/feature.xml
index 0b479a1b1ef804ada66cf3e0dca7cd656aeb337a..380212ffffdfd42b72ca335580cd29890af48897 100644
--- a/features/org.eclipse.wtp.releng.tests.feature/feature.xml
+++ b/features/org.eclipse.wtp.releng.tests.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.wtp.releng.tests.feature"
-      label="Releng Test Feature"
+      label="%featureName"
       version="1.0.1.qualifier"
       provider-name="%providerName">