diff --git a/driver-core/src/main/java/com/datastax/driver/core/CloseFuture.java b/driver-core/src/main/java/com/datastax/driver/core/CloseFuture.java
index c72ae8fc28b..51effb25775 100644
--- a/driver-core/src/main/java/com/datastax/driver/core/CloseFuture.java
+++ b/driver-core/src/main/java/com/datastax/driver/core/CloseFuture.java
@@ -28,7 +28,7 @@
  * additional {@link #force} method that can be used to expedite the shutdown
  * process (see below).
  * <p/>
- * Note that this class implements <a href="http://code.google.com/p/guava-libraries/">Guava</a>'s {@code
+ * Note that this class implements <a href="http://github.com/google/guava/">Guava</a>'s {@code
  * ListenableFuture} and can so be used with Guava's future utilities.
  */
 public abstract class CloseFuture extends AbstractFuture<Void> {
diff --git a/driver-core/src/main/java/com/datastax/driver/core/ResultSetFuture.java b/driver-core/src/main/java/com/datastax/driver/core/ResultSetFuture.java
index 52f9adeea1f..f91f3a10f81 100644
--- a/driver-core/src/main/java/com/datastax/driver/core/ResultSetFuture.java
+++ b/driver-core/src/main/java/com/datastax/driver/core/ResultSetFuture.java
@@ -26,7 +26,7 @@
 /**
  * A future on a {@link ResultSet}.
  * <p/>
- * Note that this class implements <a href="http://code.google.com/p/guava-libraries/">Guava</a>'s {@code
+ * Note that this class implements <a href="http://github.com/google/guava/">Guava</a>'s {@code
  * ListenableFuture} and can so be used with Guava's future utilities.
  */
 public interface ResultSetFuture extends ListenableFuture<ResultSet> {
diff --git a/manual/async/README.md b/manual/async/README.md
index 7c71cfcd148..c834abbfe8a 100644
--- a/manual/async/README.md
+++ b/manual/async/README.md
@@ -133,6 +133,6 @@ There are still a few places where the driver will block internally
 * trying to read fields from a [query trace] will block if the trace
   hasn't been fetched already.
 
-[ListenableFuture]: https://code.google.com/p/guava-libraries/wiki/ListenableFutureExplained
+[ListenableFuture]: https://github.com/google/guava/wiki/ListenableFutureExplained
 [init]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/Cluster.html#init--
 [query trace]: http://docs.datastax.com/en/drivers/java/3.0/com/datastax/driver/core/QueryTrace.html
diff --git a/pom.xml b/pom.xml
index 068246a9009..901a0a4bd1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -244,7 +244,7 @@
                     </bottom>
                     <links>
                         <link>https://docs.oracle.com/javase/8/docs/api/</link>
-                        <link>http://docs.guava-libraries.googlecode.com/git-history/v16.0.1/javadoc/</link>
+                        <link>https://google.github.io/guava/releases/20.0/api/docs/</link>
                         <link>http://netty.io/4.0/api/</link>
                         <!-- dependencies from driver-extras -->
                         <link>http://www.joda.org/joda-time/apidocs/</link>
diff --git a/upgrade_guide/README.md b/upgrade_guide/README.md
index 991193d46e6..761d5c2547f 100644
--- a/upgrade_guide/README.md
+++ b/upgrade_guide/README.md
@@ -84,7 +84,7 @@ We've also seized the opportunity to remove code that was deprecated in 2.1.
       for `null` inputs.
 
 3.  The driver now depends on Guava 16.0.1 (instead of 14.0.1).
-    This update has been mainly motivated by Guava's [Issue #1635](https://code.google.com/p/guava-libraries/issues/detail?id=1635),
+    This update has been mainly motivated by Guava's [Issue #1635](https://github.com/google/guava/issues/1635),
     which affects `TypeToken`, and hence all `TypeCodec` implementations handling parameterized types.
 
 4.  `UDTMapper` (the type previously used to convert `@UDT`-annotated