diff --git a/jetty.bundles.f.source/feature.xml b/jetty.bundles.f.source/feature.xml
index b0bdad0..2dc2c4b 100644
--- a/jetty.bundles.f.source/feature.xml
+++ b/jetty.bundles.f.source/feature.xml
@@ -59,12 +59,12 @@
          version="0.0.0"
          unpack="false"/>
 
-   <!--plugin
+   <plugin
          id="org.eclipse.jetty.jaspi.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/-->
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.jetty.jmx.source"
@@ -80,20 +80,7 @@
          version="0.0.0"
          unpack="false"/>
 
-   <!--plugin
-         id="org.eclipse.jetty.monitor.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.nested.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
+   <!--
    <plugin
          id="org.eclipse.jetty.nosql.source"
          download-size="0"
@@ -144,46 +131,12 @@
          version="0.0.0"
          unpack="false"/>
 
-   <!--plugin
-         id="org.eclipse.jetty.policy.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.proxy.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
+  
    <plugin
          id="org.eclipse.jetty.rewrite.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/-->
-
-<!-- no maintained at the moment
-   <plugin
-         id="org.eclipse.jetty.rhttp.client.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-   <plugin
-         id="org.eclipse.jetty.rhttp.connector.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.rhttp.gateway.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
          unpack="false"/>
 
    <plugin
@@ -192,7 +145,7 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
--->
+
    <plugin
          id="org.eclipse.jetty.server.source"
          download-size="0"
@@ -283,6 +236,19 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+   <plugin
+         id="org.eclipse.jetty.websocket.servlet.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.websocket.api.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.jetty.xml.source"
diff --git a/jetty.bundles.f/feature.xml b/jetty.bundles.f/feature.xml
index d8bdf0c..db5401b 100644
--- a/jetty.bundles.f/feature.xml
+++ b/jetty.bundles.f/feature.xml
@@ -59,12 +59,12 @@
          version="0.0.0"
          unpack="false"/>
 
-   <!--plugin
+   <plugin
          id="org.eclipse.jetty.jaspi"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/-->
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.jetty.jmx"
@@ -80,12 +80,7 @@
          version="0.0.0"
          unpack="false"/>
 
-   <!--plugin
-         id="org.eclipse.jetty.monitor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <!--
 
    <plugin
          id="org.eclipse.jetty.nested"
@@ -148,49 +143,14 @@
          version="0.0.0"
          unpack="false"/>
 
-   <!--plugin
-         id="org.eclipse.jetty.policy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.jetty.rewrite"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/-->
-<!-- no maintained at the moment
-   <plugin
-         id="org.eclipse.jetty.rhttp.client"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jetty.rhttp.connector"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.rhttp.gateway"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
--->
-   <plugin
          id="org.eclipse.jetty.security"
          download-size="0"
          install-size="0"
@@ -289,6 +249,19 @@
          unpack="false"/>
 
    <plugin
+         id="org.eclipse.jetty.websocket.servlet"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jetty.websocket.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+   <plugin
          id="org.eclipse.jetty.xml"
          download-size="0"
          install-size="0"
diff --git a/pom.xml b/pom.xml
index f5ea09f..3b4d612 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,11 +124,11 @@
       <artifactId>jetty-io</artifactId>
       <version>${jetty-version}</version>
     </dependency>
-    <!--dependency>
+    <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jaspi</artifactId>
       <version>${jetty-version}</version>
-    </dependency-->
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
@@ -174,11 +174,12 @@
       <artifactId>jetty-proxy</artifactId>
       <version>${jetty-version}</version>
     </dependency>
+  -->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-rewrite</artifactId>
       <version>${jetty-version}</version>
-    </dependency-->
+    </dependency>
     <!--dependency>
       <groupId>org.eclipse.jetty.rhttp</groupId>
       <artifactId>jetty-rhttp-client</artifactId>
@@ -265,6 +266,16 @@
       <version>${jetty-version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-api</artifactId>
+      <version>${jetty-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-servlet</artifactId>
+      <version>${jetty-version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-xml</artifactId>
       <version>${jetty-version}</version>
@@ -333,12 +344,12 @@
       <version>${jetty-version}</version>
       <classifier>sources</classifier>
     </dependency>
-    <!--dependency>
+    <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jaspi</artifactId>
       <version>${jetty-version}</version>
       <classifier>sources</classifier>
-    </dependency-->
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
@@ -387,12 +398,13 @@
       <version>${jetty-version}</version>
       <classifier>sources</classifier>
     </dependency>
+  -->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-rewrite</artifactId>
       <version>${jetty-version}</version>
       <classifier>sources</classifier>
-    </dependency-->
+    </dependency>
     <!--dependency>
       <groupId>org.eclipse.jetty.rhttp</groupId>
       <artifactId>jetty-rhttp-client</artifactId>
@@ -496,6 +508,18 @@
       <classifier>sources</classifier>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-servlet</artifactId>
+      <version>${jetty-version}</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-api</artifactId>
+      <version>${jetty-version}</version>
+      <classifier>sources</classifier>
+    </dependency>
+    <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-xml</artifactId>
       <version>${jetty-version}</version>