diff --git a/gitiles-dev/pom.xml b/gitiles-dev/pom.xml
index 9a447f7..e89732a 100644
--- a/gitiles-dev/pom.xml
+++ b/gitiles-dev/pom.xml
@@ -32,6 +32,10 @@
     Gitiles running with an embedded Jetty server.
   </description>
 
+  <properties>
+    <jettyVersion>8.1.7.v20120910</jettyVersion>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.google.gitiles</groupId>
@@ -40,9 +44,13 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>provided</scope>
+      <groupId>org.eclipse.jetty.orbit</groupId>
+      <artifactId>javax.servlet</artifactId>
+      <!-- The bulk of Gitiles is designed to compile and run against Servlet API
+        2.5, but the embedded Jetty 8 in this module only requires Servlet API
+        3.0. -->
+      <version>3.0.0.v201112011016</version>
+      <scope>compile</scope>
     </dependency>
 
     <dependency>
@@ -52,6 +60,12 @@
     </dependency>
 
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>${jettyVersion}</version>
+    </dependency>
+
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
       <version>${slf4jVersion}</version>
diff --git a/gitiles-servlet/pom.xml b/gitiles-servlet/pom.xml
index 5537693..26642e0 100644
--- a/gitiles-servlet/pom.xml
+++ b/gitiles-servlet/pom.xml
@@ -65,8 +65,11 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
+      <groupId>org.eclipse.jetty.orbit</groupId>
+      <artifactId>javax.servlet</artifactId>
+      <!-- Gitiles is designed to compile and run against Servlet API 2.5 as
+        well as 3.0; default to the earlier version. -->
+      <version>2.5.0.v201103041518</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/gitiles-war/pom.xml b/gitiles-war/pom.xml
index dfaadd7..b5369ce 100644
--- a/gitiles-war/pom.xml
+++ b/gitiles-war/pom.xml
@@ -39,18 +39,6 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/pom.xml b/pom.xml
index 4d35625..de2411b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,6 @@
   <properties>
     <!-- Should track Gerrit's versions fairly closely. -->
     <jgitVersion>2.3.1.201302201838-r.208-g75e1bdb</jgitVersion>
-    <jettyVersion>8.1.7.v20120910</jettyVersion>
     <slf4jVersion>1.6.1</slf4jVersion>
   </properties>
 
@@ -82,12 +81,6 @@
       </dependency>
 
       <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>6.0.29</version>
-      </dependency>
-
-      <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>4.11</version>
@@ -116,12 +109,6 @@
         <artifactId>commons-lang3</artifactId>
         <version>3.1</version>
       </dependency>
-
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-server</artifactId>
-        <version>${jettyVersion}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>