src/cmd/internal/objfile/goobj.go                                   | 2 +-
 src/cmd/link/auto.go                                                | 2 +-
 src/cmd/link/auto_test.go                                           | 2 +-
 src/cmd/link/dead.go                                                | 2 +-
 src/cmd/link/dead_test.go                                           | 2 +-
 src/cmd/link/layout.go                                              | 2 +-
 src/cmd/link/link_test.go                                           | 2 +-
 src/cmd/link/pclntab.go                                             | 2 +-
 src/cmd/link/pclntab_test.go                                        | 2 +-
 src/cmd/link/prog.go                                                | 2 +-
 src/cmd/link/runtime.go                                             | 2 +-
 src/cmd/link/scan.go                                                | 4 ++--
 src/debug/goobj/read.go => src/cmd/internal/goobj/read.go           | 0 
 src/debug/goobj/read_test.go => src/cmd/internal/goobj/read_test.go | 0 

diff --git a/src/cmd/internal/objfile/goobj.go b/src/cmd/internal/objfile/goobj.go
index a1d773023dc551bbfd4103b3b186e3b128306d34..6b1607a1725a5b598bb0f1fcbac2cb77080db9c0 100644
--- a/src/cmd/internal/objfile/goobj.go
+++ b/src/cmd/internal/objfile/goobj.go
@@ -7,7 +7,7 @@
 package objfile
 
 import (
-	"debug/goobj"
+	"cmd/internal/goobj"
 	"fmt"
 	"os"
 )
diff --git a/src/cmd/link/auto.go b/src/cmd/link/auto.go
index f9228e8cab179d0e1771e691f0afb42c0f89d8a9..21f6d6082722d923beb93b47a797e246ebcb8908 100644
--- a/src/cmd/link/auto.go
+++ b/src/cmd/link/auto.go
@@ -10,7 +10,7 @@ // from the compiler and assemblers as dupok data, and then remove autoData below.
 package main
 
 import (
-	"debug/goobj"
+	"cmd/internal/goobj"
 	"strconv"
 	"strings"
 )
diff --git a/src/cmd/link/auto_test.go b/src/cmd/link/auto_test.go
index 27f8e2b96d63b38ff430158b7c8168dd0b07a58c..f99e097a9c382f3d936beadd05b41855e86437ab 100644
--- a/src/cmd/link/auto_test.go
+++ b/src/cmd/link/auto_test.go
@@ -13,7 +13,7 @@ package main
 
 import (
 	"bytes"
-	"debug/goobj"
+	"cmd/internal/goobj"
 	"testing"
 )
 
diff --git a/src/cmd/link/dead.go b/src/cmd/link/dead.go
index e1e775eb3be4ebd28e462e884170d4c2e42ad4ce..ee23a61f81f96c097fc367e3e4e603bf6b848611 100644
--- a/src/cmd/link/dead.go
+++ b/src/cmd/link/dead.go
@@ -6,7 +6,7 @@ // Removal of dead code and data.
 
 package main
 
-import "debug/goobj"
+import "cmd/internal/goobj"
 
 // dead removes unreachable code and data from the program.
 // It is basically a mark-sweep garbage collection: traverse all the
diff --git a/src/cmd/link/dead_test.go b/src/cmd/link/dead_test.go
index 2e179b453b1d5a8af8accd6813f66f07141e5b69..eb34d0580d1889e486ee29c220d01b4f7c1b5c2b 100644
--- a/src/cmd/link/dead_test.go
+++ b/src/cmd/link/dead_test.go
@@ -5,7 +5,7 @@
 package main
 
 import (
-	"debug/goobj"
+	"cmd/internal/goobj"
 	"reflect"
 	"strings"
 	"testing"
diff --git a/src/cmd/link/layout.go b/src/cmd/link/layout.go
index 149ebced0fd2e931ae1aa4eb56eeb52196234a3d..d5c291e255370ff36ed1bb8eb45fa6e09545ecc0 100644
--- a/src/cmd/link/layout.go
+++ b/src/cmd/link/layout.go
@@ -7,7 +7,7 @@
 package main
 
 import (
-	"debug/goobj"
+	"cmd/internal/goobj"
 )
 
 // A layoutSection describes a single section to add to the
diff --git a/src/cmd/link/link_test.go b/src/cmd/link/link_test.go
index 984796784e7c40cb017012c22e00061fe4964066..b5ae15fc7108a008fd44096895ef3e7e053eef2c 100644
--- a/src/cmd/link/link_test.go
+++ b/src/cmd/link/link_test.go
@@ -6,7 +6,7 @@ package main
 
 import (
 	"bytes"
-	"debug/goobj"
+	"cmd/internal/goobj"
 	"io/ioutil"
 	"testing"
 )
diff --git a/src/cmd/link/pclntab.go b/src/cmd/link/pclntab.go
index 232d586bf28ec1529ac8f55f331b76df28a7248c..2d131781f2badbc4a045548432290589d023c064 100644
--- a/src/cmd/link/pclntab.go
+++ b/src/cmd/link/pclntab.go
@@ -7,7 +7,7 @@
 package main
 
 import (
-	"debug/goobj"
+	"cmd/internal/goobj"
 	"encoding/binary"
 	"os"
 	"sort"
diff --git a/src/cmd/link/pclntab_test.go b/src/cmd/link/pclntab_test.go
index 19953f5797b238e93a4a07a9cd9a0a1a657650bd..ea808067427e0b98e65b97d354d5768c8e170d77 100644
--- a/src/cmd/link/pclntab_test.go
+++ b/src/cmd/link/pclntab_test.go
@@ -6,7 +6,7 @@ package main
 
 import (
 	"bytes"
-	"debug/goobj"
+	"cmd/internal/goobj"
 	"fmt"
 	"math/rand"
 	"sort"
diff --git a/src/cmd/link/prog.go b/src/cmd/link/prog.go
index a52b5ff9b214d2a5a44bd4963e0c9665fe3a7ac0..77fb1ece5b1685c09358973870dadf7001830621 100644
--- a/src/cmd/link/prog.go
+++ b/src/cmd/link/prog.go
@@ -5,7 +5,7 @@
 package main
 
 import (
-	"debug/goobj"
+	"cmd/internal/goobj"
 	"encoding/binary"
 	"fmt"
 	"go/build"
diff --git a/src/cmd/link/runtime.go b/src/cmd/link/runtime.go
index b0c1ac98a68eeca2b1185f2be7b6b203d5568b46..acda2d24d6c6cc0c5ecbc8dc0099ce2b0057b315 100644
--- a/src/cmd/link/runtime.go
+++ b/src/cmd/link/runtime.go
@@ -7,7 +7,7 @@ // See also debug.go.
 
 package main
 
-import "debug/goobj"
+import "cmd/internal/goobj"
 
 func (p *Prog) runtime() {
 	p.pclntab()
diff --git a/src/cmd/link/scan.go b/src/cmd/link/scan.go
index 0720e039b83c1df6c668cf969e930e8232c0194e..7feb0d89002abf0b25c522fb79bf35032079f19d 100644
--- a/src/cmd/link/scan.go
+++ b/src/cmd/link/scan.go
@@ -11,7 +11,7 @@
 package main
 
 import (
-	"debug/goobj"
+	"cmd/internal/goobj"
 	"os"
 	"sort"
 	"strings"
@@ -69,7 +69,7 @@ 		p.errorf("reading %s: %v", file, err)
 		return
 	}
 
-	// TODO(rsc): Change debug/goobj to record package name as gp.Name.
+	// TODO(rsc): Change cmd/internal/goobj to record package name as gp.Name.
 	// TODO(rsc): If pkgpath == "main", check that gp.Name == "main".
 
 	pkg.Package = gp
diff --git a/src/debug/goobj/read.go b/src/cmd/internal/goobj/read.go
rename from src/debug/goobj/read.go
rename to src/cmd/internal/goobj/read.go
diff --git a/src/debug/goobj/read_test.go b/src/cmd/internal/goobj/read_test.go
rename from src/debug/goobj/read_test.go
rename to src/cmd/internal/goobj/read_test.go