diff --git a/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
index f73d839..e1ed0e2 100644
--- a/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
@@ -40,4 +40,4 @@
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.jws,
  javax.jws.soap,
- javax.xml.ws
+ javax.xml.ws;version="2.1.0"
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
index 2696153..5710342 100644
--- a/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
@@ -25,4 +25,10 @@
  org.eclipse.jst.ws.jaxws.core.utils
 Import-Package: javax.jws,
  javax.jws.soap,
- javax.xml.ws
+ javax.xml.ws;version="2.1.0",
+ javax.xml.ws.handler;version="2.1.0",
+ javax.xml.ws.handler.soap;version="2.1.0",
+ javax.xml.ws.http;version="2.1.0",
+ javax.xml.ws.soap;version="2.1.0",
+ javax.xml.ws.spi;version="2.1.0",
+ javax.xml.ws.wsaddressing;version="2.1.0"
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/plugin.xml b/bundles/org.eclipse.jst.ws.jaxws.core/plugin.xml
index 72ccc85..e4bd4ca 100644
--- a/bundles/org.eclipse.jst.ws.jaxws.core/plugin.xml
+++ b/bundles/org.eclipse.jst.ws.jaxws.core/plugin.xml
@@ -79,7 +79,8 @@
       <annotation
             category="jaxws.category"
             class="javax.xml.ws.ServiceMode"
-            name="ServiceMode">
+            name="ServiceMode"
+            restrictedTo="CLASS_ONLY">
       </annotation>
       <annotation
             category="jaxws.category"
@@ -107,8 +108,8 @@
             class="javax.xml.ws.WebEndpoint"
             name="WebEndpoint"
             restrictedTo="CLASS_ONLY">
-    <!--  </annotation>
-            <annotation
+      </annotation>
+      <annotation
             category="jaxws.category"
             class="javax.xml.ws.RespectBinding"
             name="RespectBinding"
@@ -137,7 +138,7 @@
       <annotation
             category="jaxws.category"
             class="javax.xml.ws.spi.WebServiceFeatureAnnotation"
-            name="WebServiceFeatureAnnotation"> -->
+            name="WebServiceFeatureAnnotation">
       </annotation>
    </extension>
    
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.feature/feature.xml
index d0ce38b..930bfba 100644
--- a/features/org.eclipse.jst.ws.jaxws.feature/feature.xml
+++ b/features/org.eclipse.jst.ws.jaxws.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.ws.jaxws.feature"
       label="%featureName"
-      version="0.5.1.qualifier"
+      version="0.5.2.qualifier"
       provider-name="%featureProvider"
       plugin="org.eclipse.jst.ws.jaxws.core"
       image="eclipse_update_120.jpg">
@@ -41,7 +41,7 @@
          id="javax.xml.ws"
          download-size="0"
          install-size="0"
-         version="2.0.0.qualifier"
+         version="2.1.0.qualifier"
          unpack="false"/>
 
    <plugin
@@ -58,4 +58,18 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="javax.xml.bind"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.xml.stream"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
index adfe622..7cb64dc 100644
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
+++ b/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.ws.jaxws_sdk.feature"
       label="%featureName"
-      version="0.5.1.qualifier"
+      version="0.5.2.qualifier"
       provider-name="%featureProvider"
       plugin="org.eclipse.jst.ws.jaxws.core"
       image="eclipse_update_120.jpg">
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF
index dade09d..614b308 100644
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF
@@ -16,5 +16,5 @@
  org.eclipse.ltk.ui.refactoring,
  org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0"
 Import-Package: javax.jws,
- javax.xml.ws
+ javax.xml.ws;version="2.1.0"
 Export-Package: org.eclipse.jst.ws.jaxws.core.tests