diff --git a/openpgp/armor/armor.go b/openpgp/armor/armor.go
index d1656d4ccc..ebc87876e6 100644
--- a/openpgp/armor/armor.go
+++ b/openpgp/armor/armor.go
@@ -8,8 +8,8 @@
 // Deprecated: this package is unmaintained except for security fixes. New
 // applications should consider a more focused, modern alternative to OpenPGP
 // for their specific task. If you are required to interoperate with OpenPGP
-// systems and need a maintained package, consider a maintained community fork.
-// See https://golang.org/issue/37497.
+// systems and need a maintained package, consider a community fork.
+// See https://golang.org/issue/44226.
 package armor // import "golang.org/x/crypto/openpgp/armor"
 
 import (
diff --git a/openpgp/clearsign/clearsign.go b/openpgp/clearsign/clearsign.go
index b0ede27714..644b2e078b 100644
--- a/openpgp/clearsign/clearsign.go
+++ b/openpgp/clearsign/clearsign.go
@@ -11,8 +11,8 @@
 // Deprecated: this package is unmaintained except for security fixes. New
 // applications should consider a more focused, modern alternative to OpenPGP
 // for their specific task. If you are required to interoperate with OpenPGP
-// systems and need a maintained package, consider a maintained community fork.
-// See https://golang.org/issue/37497.
+// systems and need a maintained package, consider a community fork.
+// See https://golang.org/issue/44226.
 package clearsign // import "golang.org/x/crypto/openpgp/clearsign"
 
 import (
diff --git a/openpgp/errors/errors.go b/openpgp/errors/errors.go
index 8a34b5ae3e..1d7a0ea05a 100644
--- a/openpgp/errors/errors.go
+++ b/openpgp/errors/errors.go
@@ -7,8 +7,8 @@
 // Deprecated: this package is unmaintained except for security fixes. New
 // applications should consider a more focused, modern alternative to OpenPGP
 // for their specific task. If you are required to interoperate with OpenPGP
-// systems and need a maintained package, consider a maintained community fork.
-// See https://golang.org/issue/37497.
+// systems and need a maintained package, consider a community fork.
+// See https://golang.org/issue/44226.
 package errors // import "golang.org/x/crypto/openpgp/errors"
 
 import (
diff --git a/openpgp/packet/packet.go b/openpgp/packet/packet.go
index 23c3826641..0a19794a8e 100644
--- a/openpgp/packet/packet.go
+++ b/openpgp/packet/packet.go
@@ -8,8 +8,8 @@
 // Deprecated: this package is unmaintained except for security fixes. New
 // applications should consider a more focused, modern alternative to OpenPGP
 // for their specific task. If you are required to interoperate with OpenPGP
-// systems and need a maintained package, consider a maintained community fork.
-// See https://golang.org/issue/37497.
+// systems and need a maintained package, consider a community fork.
+// See https://golang.org/issue/44226.
 package packet // import "golang.org/x/crypto/openpgp/packet"
 
 import (
diff --git a/openpgp/read.go b/openpgp/read.go
index 7052d94523..48a8931468 100644
--- a/openpgp/read.go
+++ b/openpgp/read.go
@@ -7,8 +7,8 @@
 // Deprecated: this package is unmaintained except for security fixes. New
 // applications should consider a more focused, modern alternative to OpenPGP
 // for their specific task. If you are required to interoperate with OpenPGP
-// systems and need a maintained package, consider a maintained community fork.
-// See https://golang.org/issue/37497.
+// systems and need a maintained package, consider a community fork.
+// See https://golang.org/issue/44226.
 package openpgp // import "golang.org/x/crypto/openpgp"
 
 import (
diff --git a/openpgp/s2k/s2k.go b/openpgp/s2k/s2k.go
index bd637ad299..9de04958ea 100644
--- a/openpgp/s2k/s2k.go
+++ b/openpgp/s2k/s2k.go
@@ -8,8 +8,8 @@
 // Deprecated: this package is unmaintained except for security fixes. New
 // applications should consider a more focused, modern alternative to OpenPGP
 // for their specific task. If you are required to interoperate with OpenPGP
-// systems and need a maintained package, consider a maintained community fork.
-// See https://golang.org/issue/37497.
+// systems and need a maintained package, consider a community fork.
+// See https://golang.org/issue/44226.
 package s2k // import "golang.org/x/crypto/openpgp/s2k"
 
 import (