diff --git a/WORKSPACE b/WORKSPACE
index d58b69ae19..16825f99d6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -221,10 +221,12 @@ maven_jar(
   sha1 = '675642ac208e0b741bc9118dcbcae44c271b992a',
 )
 
+load('//lib:guava.bzl', 'GUAVA_VERSION', 'GUAVA_BIN_SHA1')
+
 maven_jar(
   name = 'guava',
-  artifact = 'com.google.guava:guava:20.0-rc1',
-  sha1 = '4c2a4581b69b16a57968da32fcadb8e362b639b2',
+  artifact = 'com.google.guava:guava:' + GUAVA_VERSION,
+  sha1 = GUAVA_BIN_SHA1,
 )
 
 maven_jar(
diff --git a/gerrit-extension-api/BUILD b/gerrit-extension-api/BUILD
index d242495ea7..cbe0e26968 100644
--- a/gerrit-extension-api/BUILD
+++ b/gerrit-extension-api/BUILD
@@ -1,3 +1,4 @@
+load('//lib:guava.bzl', 'GUAVA_DOC_URL')
 load('//lib/jgit:jgit.bzl', 'JGIT_DOC_URL')
 load('//tools/bzl:gwt.bzl', 'gwt_module')
 
@@ -53,5 +54,5 @@ java_doc(
   title = 'Gerrit Review Extension API Documentation',
   libs = [':api'],
   pkgs = ['com.google.gerrit.extensions'],
-  external_docs = [JGIT_DOC_URL],
+  external_docs = [JGIT_DOC_URL, GUAVA_DOC_URL],
 )
diff --git a/lib/BUCK b/lib/BUCK
index e17bd891f9..34ca84719e 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -70,7 +70,7 @@ maven_jar(
 maven_jar(
   name = 'guava',
   id = 'com.google.guava:guava:' + GUAVA_VERSION,
-  sha1 = '4c2a4581b69b16a57968da32fcadb8e362b639b2',
+  sha1 = GUAVA_BIN_SHA1,
   license = 'Apache2.0',
 )
 
diff --git a/lib/GUAVA_VERSION b/lib/GUAVA_VERSION
index 2bfe0be68a..b5f47b39a1 100644
--- a/lib/GUAVA_VERSION
+++ b/lib/GUAVA_VERSION
@@ -1,2 +1 @@
-GUAVA_VERSION = '20.0-rc1'
-GUAVA_DOC_URL = 'https://google.github.io/guava/releases/' + GUAVA_VERSION + '/api/docs/'
+include_defs('//lib/guava.bzl')
diff --git a/lib/guava.bzl b/lib/guava.bzl
new file mode 100644
index 0000000000..a7f65c11f0
--- /dev/null
+++ b/lib/guava.bzl
@@ -0,0 +1,3 @@
+GUAVA_VERSION = '20.0-rc1'
+GUAVA_BIN_SHA1 = '4c2a4581b69b16a57968da32fcadb8e362b639b2'
+GUAVA_DOC_URL = 'https://google.github.io/guava/releases/' + GUAVA_VERSION + '/api/docs/'