diff --git a/activemq-fileserver/pom.xml b/activemq-fileserver/pom.xml
index ae02976231..44183b6775 100755
--- a/activemq-fileserver/pom.xml
+++ b/activemq-fileserver/pom.xml
@@ -66,7 +66,7 @@
     <!-- web container -->
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.5_spec</artifactId>
+      <artifactId>geronimo-servlet_3.0_spec</artifactId>
       <scope>provided</scope>
     </dependency>
 
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 23fdbe62b7..c14c40f2fb 100755
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -167,7 +167,7 @@
 
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.5_spec</artifactId>
+      <artifactId>geronimo-servlet_3.0_spec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index 7be61f7209..4b38f78110 100755
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -70,7 +70,7 @@
     <!-- web container -->
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.5_spec</artifactId>
+      <artifactId>geronimo-servlet_3.0_spec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 015e0b7ba1..5edbc35cd4 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -274,7 +274,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.5_spec</artifactId>
+      <artifactId>geronimo-servlet_3.0_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index ac2bbf1fd6..4ff62a9b90 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -247,7 +247,7 @@
         <include>org.springframework:spring-web</include>
         <include>org.springframework:spring-webmvc</include>
         <include>org.eclipse.jetty.aggregate:jetty-all</include>
-        <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
 
         <!-- JSP support -->
         <include>org.mortbay.jetty:jsp-2.1-glassfish</include>
diff --git a/pom.xml b/pom.xml
index d176cd8289..336f3fa17b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
     <jasypt-version>1.9.2</jasypt-version>
     <jaxb-bundle-version>2.2.1.1_2</jaxb-bundle-version>
     <jdom-version>1.0</jdom-version>
-    <jetty-version>7.6.9.v20130131</jetty-version>
+    <jetty-version>8.1.15.v20140411</jetty-version>
     <jmdns-version>3.4.1</jmdns-version>
     <jsp-version>2.1.v20100127</jsp-version>
     <jstl-version>1.1.2</jstl-version>
@@ -551,8 +551,8 @@
 
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-servlet_2.5_spec</artifactId>
-        <version>1.2</version>
+        <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        <version>1.0</version>
       </dependency>
 
       <dependency>