diff --git a/ogle/arch/arch.go b/ogle/arch/arch.go
index 441feed..90fd5f4 100644
--- a/ogle/arch/arch.go
+++ b/ogle/arch/arch.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package arch contains architecture-specific definitions.
-package arch
+package arch // import "golang.org/x/debug/ogle/arch"
 
 import (
 	"encoding/binary"
diff --git a/ogle/cmd/ogleproxy/main.go b/ogle/cmd/ogleproxy/main.go
index 5a53e41..5459118 100644
--- a/ogle/cmd/ogleproxy/main.go
+++ b/ogle/cmd/ogleproxy/main.go
@@ -13,7 +13,7 @@
 	"net/rpc"
 	"os"
 
-	"code.google.com/p/ogle/program/server"
+	"golang.org/x/debug/ogle/program/server"
 )
 
 var (
diff --git a/ogle/debug/dwarf/open.go b/ogle/debug/dwarf/open.go
index c1b3f37..6a58372 100644
--- a/ogle/debug/dwarf/open.go
+++ b/ogle/debug/dwarf/open.go
@@ -5,7 +5,7 @@
 // Package dwarf provides access to DWARF debugging information loaded from
 // executable files, as defined in the DWARF 2.0 Standard at
 // http://dwarfstd.org/doc/dwarf-2.0.0.pdf
-package dwarf
+package dwarf // import "golang.org/x/debug/ogle/debug/dwarf"
 
 import "encoding/binary"
 
diff --git a/ogle/debug/dwarf/pclntab_test.go b/ogle/debug/dwarf/pclntab_test.go
index 293f26f..72f3175 100644
--- a/ogle/debug/dwarf/pclntab_test.go
+++ b/ogle/debug/dwarf/pclntab_test.go
@@ -16,9 +16,9 @@
 	"strings"
 	"testing"
 
-	. "code.google.com/p/ogle/debug/dwarf"
-	"code.google.com/p/ogle/debug/elf"
-	"code.google.com/p/ogle/debug/macho"
+	. "golang.org/x/debug/ogle/debug/dwarf"
+	"golang.org/x/debug/ogle/debug/elf"
+	"golang.org/x/debug/ogle/debug/macho"
 )
 
 var (
diff --git a/ogle/debug/dwarf/type_test.go b/ogle/debug/dwarf/type_test.go
index b8bfeff..00eb3a7 100644
--- a/ogle/debug/dwarf/type_test.go
+++ b/ogle/debug/dwarf/type_test.go
@@ -5,11 +5,11 @@
 package dwarf_test
 
 import (
-	. "code.google.com/p/ogle/debug/dwarf"
+	. "golang.org/x/debug/ogle/debug/dwarf"
 	"testing"
 
-	"code.google.com/p/ogle/debug/elf"
-	"code.google.com/p/ogle/debug/macho"
+	"golang.org/x/debug/ogle/debug/elf"
+	"golang.org/x/debug/ogle/debug/macho"
 )
 
 var typedefTests = map[string]string{
diff --git a/ogle/debug/elf/elf.go b/ogle/debug/elf/elf.go
index 03e42b0..f2a1040 100644
--- a/ogle/debug/elf/elf.go
+++ b/ogle/debug/elf/elf.go
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  */
 
-package elf
+package elf // import "golang.org/x/debug/ogle/debug/elf"
 
 import "strconv"
 
diff --git a/ogle/debug/elf/file.go b/ogle/debug/elf/file.go
index 8491a77..1357d4b 100644
--- a/ogle/debug/elf/file.go
+++ b/ogle/debug/elf/file.go
@@ -13,7 +13,7 @@
 	"io"
 	"os"
 
-	"code.google.com/p/ogle/debug/dwarf"
+	"golang.org/x/debug/ogle/debug/dwarf"
 )
 
 // TODO: error reporting detail
diff --git a/ogle/debug/elf/file_test.go b/ogle/debug/elf/file_test.go
index 5524173..0691e6f 100644
--- a/ogle/debug/elf/file_test.go
+++ b/ogle/debug/elf/file_test.go
@@ -16,7 +16,7 @@
 	"runtime"
 	"testing"
 
-	"code.google.com/p/ogle/debug/dwarf"
+	"golang.org/x/debug/ogle/debug/dwarf"
 )
 
 type fileTest struct {
diff --git a/ogle/debug/macho/file.go b/ogle/debug/macho/file.go
index beab709..4acb18f 100644
--- a/ogle/debug/macho/file.go
+++ b/ogle/debug/macho/file.go
@@ -14,7 +14,7 @@
 	"io"
 	"os"
 
-	"code.google.com/p/ogle/debug/dwarf"
+	"golang.org/x/debug/ogle/debug/dwarf"
 )
 
 // A File represents an open Mach-O file.
diff --git a/ogle/debug/macho/macho.go b/ogle/debug/macho/macho.go
index d9678c8..008dc17 100644
--- a/ogle/debug/macho/macho.go
+++ b/ogle/debug/macho/macho.go
@@ -5,7 +5,7 @@
 // Mach-O header data structures
 // http://developer.apple.com/mac/library/documentation/DeveloperTools/Conceptual/MachORuntime/Reference/reference.html
 
-package macho
+package macho // import "golang.org/x/debug/ogle/debug/macho"
 
 import "strconv"
 
diff --git a/ogle/demo/ptrace-linux-amd64/main.go b/ogle/demo/ptrace-linux-amd64/main.go
index ccf9843..bc20aab 100644
--- a/ogle/demo/ptrace-linux-amd64/main.go
+++ b/ogle/demo/ptrace-linux-amd64/main.go
@@ -6,7 +6,7 @@
 // (this program) forking, executing and inserting breakpoints into a (multi-
 // threaded) Go tracee program. It logs all syscall.Wait4 results, and reading
 // those logs, as well as ../../doc/ptrace-nptl.txt, should help understand how
-// the (more complicated) code.google.com/p/ogle/program/server package works.
+// the (more complicated) golang.org/x/debug/ogle/program/server package works.
 //
 // Only tested on linux/amd64.
 package main
@@ -32,9 +32,9 @@
 	"syscall"
 	"time"
 
-	"code.google.com/p/ogle/debug/dwarf"
-	"code.google.com/p/ogle/debug/elf"
-	"code.google.com/p/ogle/debug/macho"
+	"golang.org/x/debug/ogle/debug/dwarf"
+	"golang.org/x/debug/ogle/debug/elf"
+	"golang.org/x/debug/ogle/debug/macho"
 )
 
 const (
diff --git a/ogle/gosym/symtab.go b/ogle/gosym/symtab.go
index 8a3fc2a..da1ab5d 100644
--- a/ogle/gosym/symtab.go
+++ b/ogle/gosym/symtab.go
@@ -5,7 +5,7 @@
 // Package gosym implements access to the Go symbol
 // and line number tables embedded in Go binaries generated
 // by the gc compilers.
-package gosym
+package gosym // import "golang.org/x/debug/ogle/gosym"
 
 // The table format is a variant of the format used in Plan 9's a.out
 // format, documented at http://plan9.bell-labs.com/magic/man2html/6/a.out.
diff --git a/ogle/probe/net.go b/ogle/probe/net.go
index f5a7275..87ebe98 100644
--- a/ogle/probe/net.go
+++ b/ogle/probe/net.go
@@ -11,7 +11,7 @@
 	"io" // Used only for the definitions of the various interfaces and errors.
 	"net"
 
-	"code.google.com/p/ogle/socket"
+	"golang.org/x/debug/ogle/socket"
 )
 
 var (
diff --git a/ogle/probe/net_test.go b/ogle/probe/net_test.go
index fbee543..c9d599d 100644
--- a/ogle/probe/net_test.go
+++ b/ogle/probe/net_test.go
@@ -12,7 +12,7 @@
 	"testing"
 	"unsafe"
 
-	"code.google.com/p/ogle/socket"
+	"golang.org/x/debug/ogle/socket"
 )
 
 // traceThisFunction turns on tracing and returns a function to turn it off.
diff --git a/ogle/probe/probe.go b/ogle/probe/probe.go
index 24b75af..9db1f81 100644
--- a/ogle/probe/probe.go
+++ b/ogle/probe/probe.go
@@ -4,7 +4,7 @@
 
 // Package probe is imported by programs to provide (possibly remote)
 // access to a separate debugger program.
-package probe
+package probe // import "golang.org/x/debug/ogle/probe"
 
 import (
 	"runtime/debug"
diff --git a/ogle/program/client/client.go b/ogle/program/client/client.go
index 66187d6..b0d547a 100644
--- a/ogle/program/client/client.go
+++ b/ogle/program/client/client.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package client provides remote access to an ogle proxy.
-package client
+package client // import "golang.org/x/debug/ogle/program/client"
 
 import (
 	"errors"
@@ -13,8 +13,8 @@
 	"os"
 	"os/exec"
 
-	"code.google.com/p/ogle/program"
-	"code.google.com/p/ogle/program/proxyrpc"
+	"golang.org/x/debug/ogle/program"
+	"golang.org/x/debug/ogle/program/proxyrpc"
 )
 
 var _ program.Program = (*Program)(nil)
diff --git a/ogle/program/program.go b/ogle/program/program.go
index c81b9a2..4481413 100644
--- a/ogle/program/program.go
+++ b/ogle/program/program.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package program provides the portable interface to a program being debugged.
-package program
+package program // import "golang.org/x/debug/ogle/program"
 
 import (
 	"io"
diff --git a/ogle/program/proxyrpc/proxyrpc.go b/ogle/program/proxyrpc/proxyrpc.go
index 3784268..fba3ec1 100644
--- a/ogle/program/proxyrpc/proxyrpc.go
+++ b/ogle/program/proxyrpc/proxyrpc.go
@@ -4,9 +4,9 @@
 
 // Package proxyrpc defines the types used to represent the RPC calls
 // used to the ogleproxy.
-package proxyrpc
+package proxyrpc // import "golang.org/x/debug/ogle/program/proxyrpc"
 
-import "code.google.com/p/ogle/program"
+import "golang.org/x/debug/ogle/program"
 
 // For regularity, each method has a unique Request and a Response type even
 // when not strictly necessary.
diff --git a/ogle/program/server/dwarf.go b/ogle/program/server/dwarf.go
index feaf174..a26d840 100644
--- a/ogle/program/server/dwarf.go
+++ b/ogle/program/server/dwarf.go
@@ -7,7 +7,7 @@
 import (
 	"regexp"
 
-	"code.google.com/p/ogle/debug/dwarf"
+	"golang.org/x/debug/ogle/debug/dwarf"
 )
 
 func (s *Server) lookupRE(re *regexp.Regexp) (result []string, err error) {
diff --git a/ogle/program/server/print.go b/ogle/program/server/print.go
index 8f4235f..0e14d97 100644
--- a/ogle/program/server/print.go
+++ b/ogle/program/server/print.go
@@ -9,8 +9,8 @@
 	"fmt"
 	"math"
 
-	"code.google.com/p/ogle/arch"
-	"code.google.com/p/ogle/debug/dwarf"
+	"golang.org/x/debug/ogle/arch"
+	"golang.org/x/debug/ogle/debug/dwarf"
 )
 
 // Routines to print a value using DWARF type descriptions.
diff --git a/ogle/program/server/server.go b/ogle/program/server/server.go
index f181efc..099e97b 100644
--- a/ogle/program/server/server.go
+++ b/ogle/program/server/server.go
@@ -4,7 +4,7 @@
 
 // Package server provides RPC access to a local program being debugged.
 // It is the remote end of the client implementation of the Program interface.
-package server
+package server // import "golang.org/x/debug/ogle/program/server"
 
 import (
 	"bytes"
@@ -15,12 +15,12 @@
 	"strings"
 	"syscall"
 
-	"code.google.com/p/ogle/arch"
-	"code.google.com/p/ogle/debug/dwarf"
-	"code.google.com/p/ogle/debug/elf"
-	"code.google.com/p/ogle/debug/macho"
-	"code.google.com/p/ogle/program"
-	"code.google.com/p/ogle/program/proxyrpc"
+	"golang.org/x/debug/ogle/arch"
+	"golang.org/x/debug/ogle/debug/dwarf"
+	"golang.org/x/debug/ogle/debug/elf"
+	"golang.org/x/debug/ogle/debug/macho"
+	"golang.org/x/debug/ogle/program"
+	"golang.org/x/debug/ogle/program/proxyrpc"
 )
 
 type breakpoint struct {
diff --git a/ogle/socket/socket.go b/ogle/socket/socket.go
index cc14dc4..4745dc2 100644
--- a/ogle/socket/socket.go
+++ b/ogle/socket/socket.go
@@ -4,7 +4,7 @@
 
 // Package socket provides a way for multiple processes from the same user to
 // communicate over a Unix domain socket.
-package socket
+package socket // import "golang.org/x/debug/ogle/socket"
 
 // TODO: euid instead of uid?
 // TODO: Windows support.