diff --git a/google-oauth-client-jetty/pom.xml b/google-oauth-client-jetty/pom.xml
index 27cc4dd1a..c446d0237 100644
--- a/google-oauth-client-jetty/pom.xml
+++ b/google-oauth-client-jetty/pom.xml
@@ -87,8 +87,8 @@
       <artifactId>google-oauth-client-java6</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/google-oauth-client-jetty/src/main/java/com/google/api/client/extensions/jetty/auth/oauth2/LocalServerReceiver.java b/google-oauth-client-jetty/src/main/java/com/google/api/client/extensions/jetty/auth/oauth2/LocalServerReceiver.java
index 38cdaca34..06f26f873 100644
--- a/google-oauth-client-jetty/src/main/java/com/google/api/client/extensions/jetty/auth/oauth2/LocalServerReceiver.java
+++ b/google-oauth-client-jetty/src/main/java/com/google/api/client/extensions/jetty/auth/oauth2/LocalServerReceiver.java
@@ -21,10 +21,10 @@
 import java.util.concurrent.Semaphore;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Request;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.AbstractHandler;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.AbstractHandler;
 
 /**
  * OAuth 2.0 verification code receiver that runs a Jetty server on a free port, waiting for a
@@ -118,7 +118,7 @@ public String getRedirectUri() throws IOException {
     server = new Server(port != -1 ? port : 0);
     Connector connector = server.getConnectors()[0];
     connector.setHost(host);
-    server.addHandler(new CallbackHandler());
+    server.setHandler(new CallbackHandler());
     try {
       server.start();
       port = connector.getLocalPort();
@@ -254,7 +254,8 @@ class CallbackHandler extends AbstractHandler {
 
     @Override
     public void handle(
-        String target, HttpServletRequest request, HttpServletResponse response, int dispatch)
+        String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response
+      )
         throws IOException {
       if (!callbackPath.equals(target)) {
         return;
diff --git a/pom.xml b/pom.xml
index 2230c4d5e..1805f0f13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,8 +151,8 @@
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty</artifactId>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-server</artifactId>
         <version>${project.jetty.version}</version>
       </dependency>
       <dependency>
@@ -449,7 +449,7 @@
     <project.gson.version>2.1</project.gson.version>
     <project.jackson-core-asl.version>1.9.13</project.jackson-core-asl.version>
     <project.jackson-core2.version>2.9.6</project.jackson-core2.version>
-    <project.jetty.version>6.1.26</project.jetty.version>
+    <project.jetty.version>8.2.0.v20160908</project.jetty.version>
     <project.protobuf-java.version>2.6.1</project.protobuf-java.version>
     <project.guava.version>28.1-android</project.guava.version>
     <project.xpp3.version>1.1.4c</project.xpp3.version>