diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml
index 585d1005b22..eb9887e9d7d 100644
--- a/jetty-continuation/pom.xml
+++ b/jetty-continuation/pom.xml
@@ -76,7 +76,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
+      <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
     </dependency>
   </dependencies>
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 091d8b7a7b9..de283646009 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -318,9 +318,9 @@
                   <outputDirectory>${assembly.directory}/lib</outputDirectory>
                 </artifactItem>  
                  <artifactItem>
-                  <groupId>org.mortbay.jetty</groupId>
+                  <groupId>javax.servlet</groupId>
                   <artifactId>servlet-api</artifactId>
-                  <version>${servlet-api-version}</version>
+                  <version>2.5</version>
                   <type>jar</type>
                   <overWrite>true</overWrite>
                   <includes>**</includes>
diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml
index 0d6219e6732..f3a0d4b995f 100644
--- a/jetty-rewrite/pom.xml
+++ b/jetty-rewrite/pom.xml
@@ -74,7 +74,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
+      <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
     </dependency>
     <dependency>
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index beefa05465f..83d08645524 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -94,7 +94,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
+      <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
     </dependency>
     <dependency>
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index 6d10ebebde3..cbd6fc45ecf 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -74,7 +74,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
+      <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/jetty-test-webapp/pom.xml b/jetty-test-webapp/pom.xml
index 5560385585f..93141fc8771 100644
--- a/jetty-test-webapp/pom.xml
+++ b/jetty-test-webapp/pom.xml
@@ -113,7 +113,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
+      <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index d6fb50c4475..9b880e0295f 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -69,7 +69,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
+      <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/pom.xml b/pom.xml
index b93e9a1ccc2..cefd070da4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-parent</artifactId>
-    <version>8-SNAPSHOT</version>
+    <version>8</version>
   </parent>
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>jetty-project</artifactId>
@@ -13,7 +13,6 @@
   <packaging>pom</packaging>
 
   <properties>
-    <servlet-api-version>2.5-20081211</servlet-api-version>
     <activation-version>1.1</activation-version>
     <ant-version>1.6.5</ant-version>
     <jta-spec-version>1.1.1</jta-spec-version>
@@ -101,7 +100,7 @@
             <dependency>
               <groupId>org.eclipse.jetty.toolchain</groupId>
               <artifactId>jetty-assembly-descriptors</artifactId>
-              <version>1.0-SNAPSHOT</version>
+              <version>1.0</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -177,9 +176,9 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-         <groupId>org.mortbay.jetty</groupId>
+         <groupId>javax.servlet</groupId>
          <artifactId>servlet-api</artifactId>
-         <version>${servlet-api-version}</version>
+         <version>2.5</version>
        </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>