diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/java/org/example/test/AnnotationTest.java b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/java/org/example/test/AnnotationTest.java
index 25e8b3666dd7..1151fef82867 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/java/org/example/test/AnnotationTest.java
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/java/org/example/test/AnnotationTest.java
@@ -231,10 +231,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
                     classNames.add(c.getName());
                     out.print(c.getName() + " ");
                 }
-
-                if (classNames.size() != __HandlesTypes.size())
-                    out.println("<br/><span class=\"fail\">FAIL</span>");
-                else if (!classNames.containsAll(__HandlesTypes))
+                if (!classNames.containsAll(__HandlesTypes))
                     out.println("<br/><span class=\"fail\">FAIL</span>");
                 else
                     out.println("<br/><span class=\"pass\">PASS</span>");
diff --git a/jetty-ee11/jetty-ee11-glassfish-jstl/pom.xml b/jetty-ee11/jetty-ee11-glassfish-jstl/pom.xml
index 2980bc9f8ba7..26364f2c8cff 100644
--- a/jetty-ee11/jetty-ee11-glassfish-jstl/pom.xml
+++ b/jetty-ee11/jetty-ee11-glassfish-jstl/pom.xml
@@ -28,8 +28,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.glassfish.web</groupId>
-      <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+      <groupId>org.glassfish.wasp</groupId>
+      <artifactId>wasp</artifactId>
     </dependency>
 
     <dependency>
diff --git a/jetty-ee11/jetty-ee11-glassfish-jstl/src/main/config/modules/ee11-glassfish-jstl.mod b/jetty-ee11/jetty-ee11-glassfish-jstl/src/main/config/modules/ee11-glassfish-jstl.mod
index 6077f1908cab..18ab644ced97 100644
--- a/jetty-ee11/jetty-ee11-glassfish-jstl/src/main/config/modules/ee11-glassfish-jstl.mod
+++ b/jetty-ee11/jetty-ee11-glassfish-jstl/src/main/config/modules/ee11-glassfish-jstl.mod
@@ -15,4 +15,4 @@ ee11.jakarta.servlet.jsp.jstl.impl.version?=@jakarta.servlet.jsp.jstl.impl.versi
 
 [lib]
 lib/ee11-glassfish-jstl/jakarta.servlet.jsp.jstl.jakarta.servlet.jsp.jstl-api-${ee11.jakarta.servlet.jsp.jstl.api.version}.jar
-lib/ee11-glassfish-jstl/org.glassfish.web.jakarta.servlet.jsp.jstl-${ee11.jakarta.servlet.jsp.jstl.impl.version}.jar
+lib/ee11-glassfish-jstl/org.glassfish.wasp.wasp-${ee11.jakarta.servlet.jsp.jstl.impl.version}.jar
diff --git a/jetty-ee11/jetty-ee11-glassfish-jstl/src/test/java/org/eclipse/jetty/ee11/jstl/JspConfig.java b/jetty-ee11/jetty-ee11-glassfish-jstl/src/test/java/org/eclipse/jetty/ee11/jstl/JspConfig.java
index deb61b1abe1f..fc379257444d 100644
--- a/jetty-ee11/jetty-ee11-glassfish-jstl/src/test/java/org/eclipse/jetty/ee11/jstl/JspConfig.java
+++ b/jetty-ee11/jetty-ee11-glassfish-jstl/src/test/java/org/eclipse/jetty/ee11/jstl/JspConfig.java
@@ -30,7 +30,7 @@ public static void init(WebAppContext context, URI baseUri, File scratchDir)
     {
         context.setAttribute(ServletContext.TEMPDIR, scratchDir);
         context.setAttribute("org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",
-            ".*/jetty-jakarta-servlet-api-[^/]*\\.jar$|.*jakarta.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard.*\\.jar");
+            ".*/jetty-jakarta-servlet-api-[^/]*\\.jar$|.*/wasp-[^/]*\\.jar|.*jakarta.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard.*\\.jar");
         context.setWar(baseUri.toASCIIString());
         context.setBaseResourceAsPath(Path.of(baseUri));
     }
diff --git a/jetty-ee11/jetty-ee11-home/pom.xml b/jetty-ee11/jetty-ee11-home/pom.xml
index 35085fd8f81d..2afd9487c424 100644
--- a/jetty-ee11/jetty-ee11-home/pom.xml
+++ b/jetty-ee11/jetty-ee11-home/pom.xml
@@ -285,8 +285,8 @@
             <phase>generate-resources</phase>
             <configuration>
               <prependGroupId>true</prependGroupId>
-              <includeGroupIds>jakarta.servlet.jsp.jstl,org.glassfish.web</includeGroupIds>
-              <includeArtifactIds>jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl</includeArtifactIds>
+              <includeGroupIds>jakarta.servlet.jsp.jstl,org.glassfish.wasp</includeGroupIds>
+              <includeArtifactIds>jakarta.servlet.jsp.jstl-api,wasp</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib/ee11-glassfish-jstl</outputDirectory>
             </configuration>
@@ -299,8 +299,8 @@
             <phase>generate-resources</phase>
             <configuration>
               <prependGroupId>true</prependGroupId>
-              <includeGroupIds>jakarta.servlet.jsp.jstl,org.glassfish.web</includeGroupIds>
-              <includeArtifactIds>jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl</includeArtifactIds>
+              <includeGroupIds>jakarta.servlet.jsp.jstl,org.glassfish.wasp</includeGroupIds>
+              <includeArtifactIds>jakarta.servlet.jsp.jstl-api,wasp</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
               <outputDirectory>${source-assembly-directory}/lib/ee11-glassfish-jstl</outputDirectory>
diff --git a/jetty-ee11/jetty-ee11-maven-plugin/src/main/java/org/eclipse/jetty/ee11/maven/plugin/MavenWebAppContext.java b/jetty-ee11/jetty-ee11-maven-plugin/src/main/java/org/eclipse/jetty/ee11/maven/plugin/MavenWebAppContext.java
index c50578d4a629..66f68824f1cb 100644
--- a/jetty-ee11/jetty-ee11-maven-plugin/src/main/java/org/eclipse/jetty/ee11/maven/plugin/MavenWebAppContext.java
+++ b/jetty-ee11/jetty-ee11-maven-plugin/src/main/java/org/eclipse/jetty/ee11/maven/plugin/MavenWebAppContext.java
@@ -59,7 +59,7 @@ public class MavenWebAppContext extends WebAppContext
 {
     private static final Logger LOG = LoggerFactory.getLogger(MavenWebAppContext.class);
 
-    private static final String DEFAULT_CONTAINER_INCLUDE_JAR_PATTERN = ".*/jakarta.servlet-[^/]*\\.jar$|.*/jetty-jakarta-servlet-api-[^/]*\\.jar$|.*jakarta.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard-[^/]*\\.jar$";
+    private static final String DEFAULT_CONTAINER_INCLUDE_JAR_PATTERN = ".*/jakarta.servlet-[^/]*\\.jar$|.*wasp-.*\\.jar$|.*/jetty-jakarta-servlet-api-[^/]*\\.jar$|.*jakarta.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard-[^/]*\\.jar$";
 
     private static final String WEB_INF_CLASSES_PREFIX = "/WEB-INF/classes";
 
diff --git a/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/pom.xml b/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/pom.xml
index c52da10e834c..ea17d8c9c702 100644
--- a/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/pom.xml
+++ b/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/pom.xml
@@ -56,8 +56,8 @@
       <artifactId>jetty-http2-server</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.glassfish.web</groupId>
-      <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+      <groupId>org.glassfish.wasp</groupId>
+      <artifactId>wasp</artifactId>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jasper</groupId>
diff --git a/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/src/test/java/org/eclipse/jetty/ee11/osgi/test/TestJettyOSGiBootWithJsp.java b/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/src/test/java/org/eclipse/jetty/ee11/osgi/test/TestJettyOSGiBootWithJsp.java
index b9ed65d99dc2..8ed634271ef2 100644
--- a/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/src/test/java/org/eclipse/jetty/ee11/osgi/test/TestJettyOSGiBootWithJsp.java
+++ b/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/src/test/java/org/eclipse/jetty/ee11/osgi/test/TestJettyOSGiBootWithJsp.java
@@ -68,7 +68,6 @@ public static Option[] configure()
     }
 
     @Test
-    @Disabled("TODO servlet6.1 jstl not ported to servlet 6 jars yet")
     public void testJspDump() throws Exception
     {
         if (Boolean.getBoolean(TestOSGiUtil.BUNDLE_DEBUG))
diff --git a/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/src/test/java/org/eclipse/jetty/ee11/osgi/test/TestOSGiUtil.java b/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/src/test/java/org/eclipse/jetty/ee11/osgi/test/TestOSGiUtil.java
index fbbb1763f139..b8e70b9f1170 100644
--- a/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/src/test/java/org/eclipse/jetty/ee11/osgi/test/TestOSGiUtil.java
+++ b/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/src/test/java/org/eclipse/jetty/ee11/osgi/test/TestOSGiUtil.java
@@ -248,7 +248,7 @@ public static void coreJspDependencies(List<Option> res)
         res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("apache-jsp").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-apache-jsp").versionAsInProject().start());
         res.add(mavenBundle().groupId("jakarta.servlet.jsp.jstl").artifactId("jakarta.servlet.jsp.jstl-api").versionAsInProject());
-        res.add(mavenBundle().groupId("org.glassfish.web").artifactId("jakarta.servlet.jsp.jstl").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.glassfish.wasp").artifactId("wasp").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jdt").artifactId("ecj").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.ee11.osgi").artifactId("jetty-ee11-osgi-boot-jsp").versionAsInProject().noStart());
     }
diff --git a/jetty-ee11/jetty-ee11-webapp/src/main/config/etc/jetty-ee11-deploy.xml b/jetty-ee11/jetty-ee11-webapp/src/main/config/etc/jetty-ee11-deploy.xml
index 84e2ee4fdbd9..bd61e8b4d549 100644
--- a/jetty-ee11/jetty-ee11-webapp/src/main/config/etc/jetty-ee11-deploy.xml
+++ b/jetty-ee11/jetty-ee11-webapp/src/main/config/etc/jetty-ee11-deploy.xml
@@ -48,7 +48,7 @@
           <Get name="properties">
             <Put name="jetty.deploy.containerScanJarPattern">
               <Property name="jetty.deploy.containerScanJarPattern">
-                <Default>.*/jakarta.servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$</Default>
+                <Default>.*/jakarta.servlet-api-[^/]*\.jar$|.*wasp-.*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$</Default>
               </Property>
             </Put>
             <Put name="jetty.deploy.webInfScanJarPattern">
diff --git a/jetty-ee11/jetty-ee11-webapp/src/main/config/modules/ee11-deploy.mod b/jetty-ee11/jetty-ee11-webapp/src/main/config/modules/ee11-deploy.mod
index f36f320f7992..f4af321adb8d 100644
--- a/jetty-ee11/jetty-ee11-webapp/src/main/config/modules/ee11-deploy.mod
+++ b/jetty-ee11/jetty-ee11-webapp/src/main/config/modules/ee11-deploy.mod
@@ -34,7 +34,7 @@ etc/jetty-ee11-deploy.xml
 # jetty.deploy.configurationClasses=
 
 ## Pattern to select jars from the container classloader to be scanned (or null to scan no jars)
-# jetty.deploy.containerScanJarPattern=.*/jakarta.servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$
+# jetty.deploy.containerScanJarPattern=.*/jakarta.servlet-api-[^/]*\.jar$|.*wasp-.*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$
 
 ## Pattern to select jars from the container classloader to be scanned (or null to scan all jars).
 # jetty.deploy.webInfScanJarPattern=
diff --git a/jetty-ee11/pom.xml b/jetty-ee11/pom.xml
index 8226ff3dacc7..3c80f8c5172d 100644
--- a/jetty-ee11/pom.xml
+++ b/jetty-ee11/pom.xml
@@ -387,8 +387,8 @@
         <version>${jersey.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.glassfish.web</groupId>
-        <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+        <groupId>org.glassfish.wasp</groupId>
+        <artifactId>wasp</artifactId>
         <version>${jakarta.servlet.jsp.jstl.impl.version}</version>
       </dependency>
       <dependency>
@@ -672,13 +672,13 @@
                         </ignoreVersions>
                       </rule>
                       <rule>
-                        <!-- for ee11, we need to stay on 3.0.x of jsp-jstl impl -->
-                        <groupId>org.glassfish.web</groupId>
-                        <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+                        <!-- for ee11, we need to be on 4.0.x of jsp-jstl impl -->
+                        <groupId>org.glassfish.wasp</groupId>
+                        <artifactId>wasp</artifactId>
                         <ignoreVersions>
                           <ignoreVersion>
                             <type>regex</type>
-                            <version>^(?!3.0.).+</version>
+                            <version>^(?!4.0.).+</version>
                           </ignoreVersion>
                         </ignoreVersions>
                       </rule>
diff --git a/pom.xml b/pom.xml
index a2db7a6f834b..eb967440caef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,8 +224,8 @@
     <ee11.jakarta.mail.api.version>2.1.3</ee11.jakarta.mail.api.version>
     <ee11.jakarta.servlet.api.version>6.1.0</ee11.jakarta.servlet.api.version>
     <ee11.jakarta.servlet.jsp.api.version>4.0.0</ee11.jakarta.servlet.jsp.api.version>
-    <ee11.jakarta.servlet.jsp.jstl.api.version>3.0.0</ee11.jakarta.servlet.jsp.jstl.api.version>
-    <ee11.jakarta.servlet.jsp.jstl.impl.version>3.0.1</ee11.jakarta.servlet.jsp.jstl.impl.version>
+    <ee11.jakarta.servlet.jsp.jstl.api.version>3.0.2</ee11.jakarta.servlet.jsp.jstl.api.version>
+    <ee11.jakarta.servlet.jsp.jstl.impl.version>4.0.0</ee11.jakarta.servlet.jsp.jstl.impl.version>
     <ee11.jakarta.transaction-api.version>2.0.1</ee11.jakarta.transaction-api.version>
     <ee11.jakarta.websocket.api.version>2.2.0-M1</ee11.jakarta.websocket.api.version>
     <ee11.jakarta.ws.rs.api.version>4.0.0</ee11.jakarta.ws.rs.api.version>