diff --git a/modules/crypto/ssh/agent/client.go b/modules/crypto/ssh/agent/client.go
index 1b50d756c81..99e3099062a 100755
--- a/modules/crypto/ssh/agent/client.go
+++ b/modules/crypto/ssh/agent/client.go
@@ -8,7 +8,7 @@
 References:
   [PROTOCOL.agent]:    http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.agent?rev=HEAD
 */
-package agent // import "golang.org/x/crypto/ssh/agent"
+package agent
 
 import (
 	"bytes"
diff --git a/modules/crypto/ssh/doc.go b/modules/crypto/ssh/doc.go
index d6be8946629..a5ff8af6b24 100755
--- a/modules/crypto/ssh/doc.go
+++ b/modules/crypto/ssh/doc.go
@@ -15,4 +15,4 @@ References:
   [PROTOCOL.certkeys]: http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.certkeys?rev=HEAD
   [SSH-PARAMETERS]:    http://www.iana.org/assignments/ssh-parameters/ssh-parameters.xml#ssh-parameters-1
 */
-package ssh // import "golang.org/x/crypto/ssh"
+package ssh
diff --git a/modules/crypto/ssh/terminal/util.go b/modules/crypto/ssh/terminal/util.go
index 598e3df77e7..0763c9a9789 100755
--- a/modules/crypto/ssh/terminal/util.go
+++ b/modules/crypto/ssh/terminal/util.go
@@ -14,7 +14,7 @@
 // 	        panic(err)
 // 	}
 // 	defer terminal.Restore(0, oldState)
-package terminal // import "golang.org/x/crypto/ssh/terminal"
+package terminal
 
 import (
 	"io"
diff --git a/modules/crypto/ssh/test/doc.go b/modules/crypto/ssh/test/doc.go
index 3f9b3346dfa..29ad65e96cc 100755
--- a/modules/crypto/ssh/test/doc.go
+++ b/modules/crypto/ssh/test/doc.go
@@ -4,4 +4,4 @@
 
 // This package contains integration tests for the
 // golang.org/x/crypto/ssh package.
-package test // import "golang.org/x/crypto/ssh/test"
+package test
diff --git a/modules/crypto/ssh/testdata/doc.go b/modules/crypto/ssh/testdata/doc.go
index fcae47ca687..ae7bd8b89ec 100755
--- a/modules/crypto/ssh/testdata/doc.go
+++ b/modules/crypto/ssh/testdata/doc.go
@@ -5,4 +5,4 @@
 // This package contains test data shared between the various subpackages of
 // the golang.org/x/crypto/ssh package. Under no circumstance should
 // this data be used for production code.
-package testdata // import "golang.org/x/crypto/ssh/testdata"
+package testdata