diff --git a/dev-go/oauth2/Manifest b/dev-go/oauth2/Manifest
index 29edda1..7ccd16e 100644
--- a/dev-go/oauth2/Manifest
+++ b/dev-go/oauth2/Manifest
@@ -1 +1 @@
-DIST go.googlesource.com-oauth2-fdc9e635145ae97e6c2cb777c48305600cf515cb.tar.gz 40633 SHA256 07a8a55086a1d7a456b6cfadb80a8af1c72fd79a44fa7c57f2625a58f61170b7 SHA512 bea1960fd3449edd384ba60c5ef1b13b0225a93ebb8d36d69a0f015fdbf043d978909e28f693ec70421f942c07bfcee3c1c3f1057e3115ab40dd86c468808448 WHIRLPOOL 755d6d9ab5dd6ab23974205a3ae3a8b6eeec7008c7ae52a6e296f2d95bf3ef753fac90ab428a0d6d54989155bdcfdda9f70821f8eaf529778849331a526b14d9
+DIST go.googlesource.com-oauth2-d3ed0bb246c8d3c75b63937d9a5eecff9c74d7fe.tar.gz 87832 BLAKE2B bd1eade3bad2a9fc1221248c0ec0ba62ba50641a0448492fe9375b1799d2b541a528aae2c673851516a5d8d4e4e073798d8d167710083605b1354d5dd0928cd5 SHA512 98e7e2dfe44585619c0f46e1f159d7c81889beea1588c662927cd2cb39718e2b7170ba40b65e1568b78d1ea389b3eeab4c0b76036d597bcc42c32cbbefb0c3cf
diff --git a/dev-go/oauth2/oauth2-0.0.1-r5.ebuild b/dev-go/oauth2/oauth2-0.0.1-r6.ebuild
similarity index 100%
rename from dev-go/oauth2/oauth2-0.0.1-r5.ebuild
rename to dev-go/oauth2/oauth2-0.0.1-r6.ebuild
diff --git a/dev-go/oauth2/oauth2-0.0.1.ebuild b/dev-go/oauth2/oauth2-0.0.1.ebuild
index b1d0952..e63ba89 100644
--- a/dev-go/oauth2/oauth2-0.0.1.ebuild
+++ b/dev-go/oauth2/oauth2-0.0.1.ebuild
@@ -1,16 +1,18 @@
 # Copyright 2017 The Chromium OS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2.
 
-EAPI=5
+EAPI=7
 
-CROS_GO_SOURCE="go.googlesource.com/oauth2:golang.org/x/oauth2 fdc9e635145ae97e6c2cb777c48305600cf515cb"
+CROS_GO_SOURCE="go.googlesource.com/oauth2:golang.org/x/oauth2 d3ed0bb246c8d3c75b63937d9a5eecff9c74d7fe"
 
 CROS_GO_PACKAGES=(
 	"golang.org/x/oauth2"
+	"golang.org/x/oauth2/authhandler"
 	"golang.org/x/oauth2/internal"
 	"golang.org/x/oauth2/jws"
 	"golang.org/x/oauth2/jwt"
 	"golang.org/x/oauth2/google"
+	"golang.org/x/oauth2/google/internal/externalaccount"
 )
 
 CROS_GO_TEST=(