diff --git a/lang/go-devel/Makefile b/lang/go-devel/Makefile
index 9fa329b651c2..978ca156c081 100644
--- a/lang/go-devel/Makefile
+++ b/lang/go-devel/Makefile
@@ -1,8 +1,9 @@
 # Created by: Devon H. O'Dell <devon.odell@gmail.com>
 # $FreeBSD$
 
-PORTVERSION=	g20200601
+PORTVERSION=	g20200610
 # Always set PORTREVISION and PORTEPOCH explicitly as otherwise it is inherited from lang/go
+PORTREVISION=	0
 PORTEPOCH=	0
 MASTER_SITES=	https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
 		LOCAL/dmgk:bootstrap
@@ -13,7 +14,7 @@ COMMENT=	Go programming language (development version)
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	golang
-GH_TAGNAME=	83b181c68bf332ac7948f145f33d128377a09c42
+GH_TAGNAME=	e92be18fd8b525b642ca25bdb3e2056b35d9d73c
 
 CONFLICTS_INSTALL=	go
 
diff --git a/lang/go-devel/distinfo b/lang/go-devel/distinfo
index b1b956ad495b..53982936bc6c 100644
--- a/lang/go-devel/distinfo
+++ b/lang/go-devel/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1591102554
+TIMESTAMP = 1591878640
 SHA256 (go-freebsd-arm64-go1.14.tar.xz) = f8b0cf0d323e581c9e3e0d5c217847a3e0294fcc92dbac92a5b02cea9d97ad8d
 SIZE (go-freebsd-arm64-go1.14.tar.xz) = 34944548
-SHA256 (golang-go-g20200601-83b181c68bf332ac7948f145f33d128377a09c42_GH0.tar.gz) = 26967ea1f357b3942694b0ff1b86c1e3e1ecb6e0d1a0ac70a2bed9c1495044e3
-SIZE (golang-go-g20200601-83b181c68bf332ac7948f145f33d128377a09c42_GH0.tar.gz) = 22485615
+SHA256 (golang-go-g20200610-e92be18fd8b525b642ca25bdb3e2056b35d9d73c_GH0.tar.gz) = 9d4aa84085e6cc72cacc6c88555008187cc555d942e3d5f55364ed2cd2656b63
+SIZE (golang-go-g20200610-e92be18fd8b525b642ca25bdb3e2056b35d9d73c_GH0.tar.gz) = 22902410
 SHA256 (go-freebsd-amd64-go1.14.tar.xz) = 3b259247fb228258a4f31e283e9aa23cafd590eabce334666a9e9b2ffe47c19b
 SIZE (go-freebsd-amd64-go1.14.tar.xz) = 35927980
 SHA256 (go-freebsd-arm6-go1.14.tar.xz) = 5846b4bbc6881c6c04daffbdb647d53a5b002a0e177271ecfcabef734b209614
diff --git a/lang/go-devel/files/patch-src_cmd_go_internal_modload_init.go b/lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go
similarity index 68%
rename from lang/go-devel/files/patch-src_cmd_go_internal_modload_init.go
rename to lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go
index f9042fa87bff..d4610796b18f 100644
--- a/lang/go-devel/files/patch-src_cmd_go_internal_modload_init.go
+++ b/lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go
@@ -1,7 +1,6 @@
-Upstream PR: https://github.com/golang/go/issues/37948
---- src/cmd/go/internal/modload/init.go.orig	2020-02-25 18:32:50 UTC
-+++ src/cmd/go/internal/modload/init.go
-@@ -562,7 +562,7 @@ func checkVendorConsistency() {
+--- src/cmd/go/internal/modload/vendor.go.orig	2020-06-11 12:36:37 UTC
++++ src/cmd/go/internal/modload/vendor.go
+@@ -133,7 +133,7 @@ func checkVendorConsistency() {
  	readVendorList()
  
  	pre114 := false