diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index eb78fe4ae87..a4679dc8c65 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -59,9 +59,8 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
+      <artifactId>jetty-server</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
diff --git a/pom.xml b/pom.xml
index 95dfc29e7b9..db333ba40ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -394,10 +394,10 @@
     <dependencies>
       <!-- Orbit Deps -->
       <dependency>
-         <groupId>org.eclipse.jetty.orbit</groupId>
-         <artifactId>javax.servlet</artifactId>
-         <version>3.0.0.v201112011016</version>
-       </dependency>
+        <groupId>org.eclipse.jetty.orbit</groupId>
+        <artifactId>javax.servlet</artifactId>
+        <version>${orbit-servlet-api-version}</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.orbit</groupId>
         <artifactId>javax.annotation</artifactId>