diff --git a/README.md b/README.md
index 18910cb..9381984 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-[![GoDoc](https://godoc.org/cuelang.org/go?status.svg)](https://godoc.org/cuelang.org/go)
+[![Go Reference](https://pkg.go.dev/badge/cuelang.org/go.svg)](https://pkg.go.dev/cuelang.org/go)
 [![Github](https://github.com/cuelang/cue/workflows/Test/badge.svg)](https://github.com/cuelang/cue/actions)
 [![GolangCI](https://golangci.com/badges/github.com/cuelang/cue.svg)](https://golangci.com/r/github.com/cuelang/cue)
 [![Go 1.13+](https://img.shields.io/badge/go-1.13-9cf.svg)](https://golang.org/dl/)
@@ -125,9 +125,9 @@
 
 - [Language Specification](./doc/ref/spec.md): official CUE Language specification.
 
-- [API](https://godoc.org/cuelang.org/go/cue): the API on godoc.org
+- [API](https://pkg.go.dev/cuelang.org/go/cue): the API on pkg.go.dev
 
-- [Builtin packages](https://godoc.org/cuelang.org/go/pkg): builtins available from CUE programs
+- [Builtin packages](https://pkg.go.dev/cuelang.org/go/pkg): builtins available from CUE programs
 
 - [`cue` Command line reference](./doc/cmd/cue.md): the `cue` command
 
diff --git a/pkg/tool/cli/gen.go b/pkg/tool/cli/gen.go
index 4325b72..7a74854 100644
--- a/pkg/tool/cli/gen.go
+++ b/pkg/tool/cli/gen.go
@@ -17,7 +17,7 @@
 package main
 
 // TODO: remove when we have a cuedoc server. Until then,
-// piggyback on godoc.org.
+// piggyback on pkg.go.dev.
 
 import (
 	"bytes"
diff --git a/pkg/tool/exec/gen.go b/pkg/tool/exec/gen.go
index c8bc071..730d611 100644
--- a/pkg/tool/exec/gen.go
+++ b/pkg/tool/exec/gen.go
@@ -17,7 +17,7 @@
 package main
 
 // TODO: remove when we have a cuedoc server. Until then,
-// piggyback on godoc.org.
+// piggyback on pkg.go.dev.
 
 import (
 	"bytes"
diff --git a/pkg/tool/file/gen.go b/pkg/tool/file/gen.go
index a67f796..def827c 100644
--- a/pkg/tool/file/gen.go
+++ b/pkg/tool/file/gen.go
@@ -17,7 +17,7 @@
 package main
 
 // TODO: remove when we have a cuedoc server. Until then,
-// piggyback on godoc.org.
+// piggyback on pkg.go.dev.
 
 import (
 	"bytes"
diff --git a/pkg/tool/gen.go b/pkg/tool/gen.go
index 6c0ea21..8f6555d 100644
--- a/pkg/tool/gen.go
+++ b/pkg/tool/gen.go
@@ -17,7 +17,7 @@
 package main
 
 // TODO: remove when we have a cuedoc server. Until then,
-// piggyback on godoc.org.
+// piggyback on pkg.go.dev.
 
 import (
 	"bytes"
diff --git a/pkg/tool/http/gen.go b/pkg/tool/http/gen.go
index 88c9752..01f6137 100644
--- a/pkg/tool/http/gen.go
+++ b/pkg/tool/http/gen.go
@@ -17,7 +17,7 @@
 package main
 
 // TODO: remove when we have a cuedoc server. Until then,
-// piggyback on godoc.org.
+// piggyback on pkg.go.dev.
 
 import (
 	"bytes"
diff --git a/pkg/tool/os/gen.go b/pkg/tool/os/gen.go
index b6df11a..9f33651 100644
--- a/pkg/tool/os/gen.go
+++ b/pkg/tool/os/gen.go
@@ -17,7 +17,7 @@
 package main
 
 // TODO: remove when we have a cuedoc server. Until then,
-// piggyback on godoc.org.
+// piggyback on pkg.go.dev.
 
 import (
 	"bytes"