diff --git a/assembly/features/org.eclipse.jst.sdk/feature.xml b/assembly/features/org.eclipse.jst.sdk/feature.xml
index 0afe097ebe83b4baa8fd9b97a986507289bd674f..f43cfb3515933a57d18a66364c5be3f9bd712797 100644
--- a/assembly/features/org.eclipse.jst.sdk/feature.xml
+++ b/assembly/features/org.eclipse.jst.sdk/feature.xml
@@ -42,11 +42,16 @@
     <includes
         id="org.eclipse.jst.enterprise_sdk.feature"
         version="0.0.0" />
-
+         
     <includes
         id="org.eclipse.jst.doc.isv.feature"
         version="0.0.0" />
 
+   <includes
+         optional="true"
+         id="org.eclipse.jst.webpageeditor_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 
 		if user selects to -->
diff --git a/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java b/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java
index cfc6593c4928961e5054815ab09d46f694c96a38..a6915e33298fd56b65101c8eb3c5d3ac26d7b538 100644
--- a/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java
+++ b/tests/org.eclipse.wtp.releng.tests/src/org/eclipse/wtp/releng/tests/BuildTests.java
@@ -75,8 +75,8 @@ public class BuildTests extends TestCase {
 	private static final String REQUIRED_BUNDLE_SUFFIX = ".jar";
 
 	private static final String[] SUFFIX_EXEMPT_LIST = {"org.eclipse.swt", "org.apache.ant"};
-	private static final int EXPECTED_NUMBER_OF_FEATURES = 153;
-	private static final int EXPECTED_NUMBER_OF_PLUGINS = 580;
+	private static final int EXPECTED_NUMBER_OF_FEATURES = 155;
+	private static final int EXPECTED_NUMBER_OF_PLUGINS = 581;
 
 	/**
 	 * Constructor for EmptyDirectoriesTest.