diff --git a/gerrit-acceptance-tests/BUCK b/gerrit-acceptance-tests/BUCK
index 100f0cc6c9..21f10f1793 100644
--- a/gerrit-acceptance-tests/BUCK
+++ b/gerrit-acceptance-tests/BUCK
@@ -24,7 +24,7 @@ java_library(
     '//lib:h2',
     '//lib:jsch',
     '//lib:junit',
-    '//lib:servlet-api-3_0',
+    '//lib:servlet-api-3_1',
 
     '//lib/commons:httpclient',
     '//lib/commons:httpcore',
diff --git a/gerrit-extension-api/BUCK b/gerrit-extension-api/BUCK
index cd148547e7..63738e504f 100644
--- a/gerrit-extension-api/BUCK
+++ b/gerrit-extension-api/BUCK
@@ -20,7 +20,7 @@ java_library(
     ':api',
     '//lib/guice:guice',
     '//lib/guice:guice-servlet',
-    '//lib:servlet-api-3_0',
+    '//lib:servlet-api-3_1',
   ],
   visibility = ['PUBLIC'],
 )
diff --git a/gerrit-gwtexpui/BUCK b/gerrit-gwtexpui/BUCK
index 2936050a89..b2a9ca6cf9 100644
--- a/gerrit-gwtexpui/BUCK
+++ b/gerrit-gwtexpui/BUCK
@@ -54,7 +54,7 @@ java_library(
 java_library2(
   name = 'linker_server',
   srcs = glob([SRC + 'linker/server/*.java']),
-  compile_deps = ['//lib:servlet-api-3_0'],
+  compile_deps = ['//lib:servlet-api-3_1'],
   visibility = ['PUBLIC'],
 )
 
@@ -101,6 +101,6 @@ gwt_module(
 java_library2(
   name = 'server',
   srcs = glob([SRC + 'server/*.java']),
-  compile_deps = ['//lib:servlet-api-3_0'],
+  compile_deps = ['//lib:servlet-api-3_1'],
   visibility = ['PUBLIC'],
 )
diff --git a/gerrit-httpd/BUCK b/gerrit-httpd/BUCK
index 513a29d96d..dac875ef60 100644
--- a/gerrit-httpd/BUCK
+++ b/gerrit-httpd/BUCK
@@ -35,7 +35,7 @@ java_library2(
     '//lib/log:api',
     '//lib/lucene:core',
   ],
-  compile_deps = ['//lib:servlet-api-3_0'],
+  compile_deps = ['//lib:servlet-api-3_1'],
   visibility = ['PUBLIC'],
 )
 
@@ -59,7 +59,7 @@ java_test(
     '//lib:gson',
     '//lib:gwtorm',
     '//lib:guava',
-    '//lib:servlet-api-3_0',
+    '//lib:servlet-api-3_1',
     '//lib/guice:guice',
     '//lib/jgit:jgit',
     '//lib/jgit:junit',
diff --git a/gerrit-openid/BUCK b/gerrit-openid/BUCK
index 53604de088..90d0d482e6 100644
--- a/gerrit-openid/BUCK
+++ b/gerrit-openid/BUCK
@@ -18,6 +18,6 @@ java_library2(
     '//lib/log:api',
     '//lib/openid:consumer',
   ],
-  compile_deps = ['//lib:servlet-api-3_0'],
+  compile_deps = ['//lib:servlet-api-3_1'],
   visibility = ['PUBLIC'],
 )
diff --git a/gerrit-pgm/BUCK b/gerrit-pgm/BUCK
index 9f397fceb2..c24342a6e3 100644
--- a/gerrit-pgm/BUCK
+++ b/gerrit-pgm/BUCK
@@ -110,7 +110,7 @@ java_library2(
     '//lib:guava',
     '//lib:gwtorm',
     '//lib:h2',
-    '//lib:servlet-api-3_0',
+    '//lib:servlet-api-3_1',
     '//lib/guice:guice',
     '//lib/guice:guice-servlet',
     '//lib/jetty:server',
diff --git a/gerrit-plugin-api/BUCK b/gerrit-plugin-api/BUCK
index 8498e0d39f..d808e0ffcc 100644
--- a/gerrit-plugin-api/BUCK
+++ b/gerrit-plugin-api/BUCK
@@ -28,7 +28,7 @@ java_library(
     '//lib:guava',
     '//lib:gwtorm',
     '//lib:jsch',
-    '//lib:servlet-api-3_0',
+    '//lib:servlet-api-3_1',
     '//lib/guice:guice',
     '//lib/guice:guice-assistedinject',
     '//lib/guice:guice-servlet',
diff --git a/gerrit-war/BUCK b/gerrit-war/BUCK
index fa9a88f7e5..55363b113b 100644
--- a/gerrit-war/BUCK
+++ b/gerrit-war/BUCK
@@ -22,7 +22,7 @@ java_library2(
     '//lib/log:api',
     '//lib/jgit:jgit',
   ],
-  compile_deps = ['//lib:servlet-api-3_0'],
+  compile_deps = ['//lib:servlet-api-3_1'],
   visibility = [
     '//:',
     '//gerrit-gwtdebug:gwtdebug',
diff --git a/lib/BUCK b/lib/BUCK
index 181e3e5e9a..9a86a7fa5e 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -112,9 +112,9 @@ maven_jar(
 )
 
 maven_jar(
-  name = 'servlet-api-3_0',
-  id = 'org.apache.tomcat:tomcat-servlet-api:7.0.32',
-  sha1 = 'e2f21e9868414122e6dd23ac66cf304d4290642c',
+  name = 'servlet-api-3_1',
+  id = 'org.apache.tomcat:tomcat-servlet-api:8.0.0-RC10',
+  sha1 = '975935b6203073938dfeeb28e4effc3b094c4fc4',
   license = 'Apache2.0',
   exclude = ['META-INF/NOTICE', 'META-INF/LICENSE'],
 )
diff --git a/lib/jetty/BUCK b/lib/jetty/BUCK
index e31ab438c0..f5771f4591 100644
--- a/lib/jetty/BUCK
+++ b/lib/jetty/BUCK
@@ -1,16 +1,16 @@
 include_defs('//lib/maven.defs')
 
-VERSION = '9.0.6.v20130930'
+VERSION = '9.1.0.v20131115'
 EXCLUDE = ['about.html']
 
 maven_jar(
   name = 'servlet',
   id = 'org.eclipse.jetty:jetty-servlet:' + VERSION,
-  sha1 = 'b6953af6f857e78fe3c46935fa96f9c80a9cbefd',
+  sha1 = 'bf92dbb4426e5d14973726861accda38d93baa64',
   license = 'Apache2.0',
   deps = [
     ':security',
-    '//lib:servlet-api-3_0',
+    '//lib:servlet-api-3_1',
   ],
   exclude = EXCLUDE,
 )
@@ -18,7 +18,7 @@ maven_jar(
 maven_jar(
   name = 'security',
   id = 'org.eclipse.jetty:jetty-security:' + VERSION,
-  sha1 = 'b16cd29ad9d3d3cca8176a654adf4b2ddca0eb3e',
+  sha1 = '0ec8b3000720c746ba03d96a2172c88124509c57',
   license = 'Apache2.0',
   deps = [':server'],
   exclude = EXCLUDE,
@@ -28,7 +28,7 @@ maven_jar(
 maven_jar(
   name = 'server',
   id = 'org.eclipse.jetty:jetty-server:' + VERSION,
-  sha1 = 'd89016c2bcd380f548530fa049295e62601dc564',
+  sha1 = 'c64cb3ab62ff32fcd8b838369a426c688d901103',
   license = 'Apache2.0',
   exported_deps = [
     ':continuation',
@@ -40,7 +40,7 @@ maven_jar(
 maven_jar(
   name = 'continuation',
   id = 'org.eclipse.jetty:jetty-continuation:' + VERSION,
-  sha1 = '4f942a52a3e996634ff302ab98f46d224b0db9d2',
+  sha1 = '5751f7ea38488dd32180bd3273f7f8591928aee3',
   license = 'Apache2.0',
   exclude = EXCLUDE,
 )
@@ -48,7 +48,7 @@ maven_jar(
 maven_jar(
   name = 'http',
   id = 'org.eclipse.jetty:jetty-http:' + VERSION,
-  sha1 = 'b3a2302717ac1889b4a17ed03e2555f8291121b9',
+  sha1 = '1ee35683e75298b3fe246befd1cd88b6e6087427',
   license = 'Apache2.0',
   exported_deps = [':io'],
   exclude = EXCLUDE,
@@ -57,7 +57,7 @@ maven_jar(
 maven_jar(
   name = 'io',
   id = 'org.eclipse.jetty:jetty-io:' + VERSION,
-  sha1 = 'f3a66e0507d963c51e280243f0472a5b2eadc8b1',
+  sha1 = '99e4632a0760f5fb2a110d25df992faf959700d6',
   license = 'Apache2.0',
   exported_deps = [':util'],
   exclude = EXCLUDE,
@@ -67,7 +67,7 @@ maven_jar(
 maven_jar(
   name = 'util',
   id = 'org.eclipse.jetty:jetty-util:' + VERSION,
-  sha1 = 'f36c9e61559d1154be9b52803ef4f586e401dac6',
+  sha1 = '440fc44218366a7b58739aef4402b4927e135b9c',
   license = 'Apache2.0',
   exclude = EXCLUDE,
   visibility = [],