diff --git a/gwtp-core/gwtp-crawler/pom.xml b/gwtp-core/gwtp-crawler/pom.xml
index 199695556a..14fee2b8cc 100644
--- a/gwtp-core/gwtp-crawler/pom.xml
+++ b/gwtp-core/gwtp-crawler/pom.xml
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
         <!-- DI dependencies -->
diff --git a/gwtp-core/pom.xml b/gwtp-core/pom.xml
index f951d5825e..0160774adc 100644
--- a/gwtp-core/pom.xml
+++ b/gwtp-core/pom.xml
@@ -222,8 +222,8 @@
             <!-- Standard Java extension jars -->
             <dependency>
                 <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>${servlet-api.version}</version>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>${javax.servlet-api.version}</version>
             </dependency>
             <dependency>
                 <groupId>javax.inject</groupId>
diff --git a/gwtp-crawler-service/pom.xml b/gwtp-crawler-service/pom.xml
index caa7fdb1cf..19efec322c 100644
--- a/gwtp-crawler-service/pom.xml
+++ b/gwtp-crawler-service/pom.xml
@@ -29,8 +29,8 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>${servlet-api.version}</version>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>${javax.servlet-api.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
diff --git a/pom.xml b/pom.xml
index d81282d465..8384a28dad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -273,7 +273,7 @@
         <guava.version>18.0</guava.version>
         <objectify.version>5.0.2</objectify.version>
         <persistence-api.version>1.0</persistence-api.version>
-        <servlet-api.version>2.5</servlet-api.version>
+        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <spring.version>4.0.5.RELEASE</spring.version>
         <velocity.version>1.7</velocity.version>
         <auto-common.version>1.0-SNAPSHOT</auto-common.version>