diff --git a/cmd/bundle/main.go b/cmd/bundle/main.go
new file mode 100644
index 00000000..35b16eb5
--- /dev/null
+++ b/cmd/bundle/main.go
@@ -0,0 +1,220 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// The bundle command concatenates the source files of a package,
+// renaming package-level names by adding a prefix and renaming
+// identifiers as needed to preserve referential integrity.
+//
+// Example:
+// 	$ bundle golang.org/x/net/http2 net/http http2
+//
+// The command above prints a single file containing the code of
+// golang.org/x/net/http2, suitable for inclusion in package net/http,
+// in which toplevel names have been prefixed with "http2".
+//
+// Assumptions:
+// - no file in the package imports "C", that is, uses cgo.
+// - no file in the package has GOOS or GOARCH build tags or file names.
+// - comments associated with the package or import declarations,
+//   or associated with no top-level declaration at all,
+//   may be discarded.
+// - neither the original package nor the destination package contains
+//   any identifiers starting with the designated prefix.
+//   (This allows us to avoid various conflict checks.)
+// - there are no renaming imports.
+// - test files are ignored.
+// - none of the renamed identifiers is significant
+//   to reflection-based logic.
+//
+// Only package-level var, func, const, and type objects are renamed,
+// and embedded fields of renamed types.  No methods are renamed, so we
+// needn't worry about preserving interface satisfaction.
+//
+// TODO(adonovan): gofmt the result.
+//
+package main
+
+import (
+	"bytes"
+	"flag"
+	"fmt"
+	"go/ast"
+	"go/build"
+	"go/format"
+	"go/parser"
+	"go/token"
+	"io"
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"golang.org/x/tools/go/loader"
+	"golang.org/x/tools/go/types"
+)
+
+func main() {
+	log.SetPrefix("bundle: ")
+	log.SetFlags(0)
+
+	flag.Parse()
+	args := flag.Args()
+	if len(args) != 3 {
+		log.Fatal(`Usage: bundle package dest prefix
+
+Arguments:
+ package is the import path of the package to concatenate.
+ dest is the import path of the package in which the resulting file will reside.
+ prefix is the string to attach to all renamed identifiers.
+`)
+	}
+	initialPkg, dest, prefix := args[0], args[1], args[2]
+
+	if err := bundle(os.Stdout, initialPkg, dest, prefix); err != nil {
+		log.Fatal(err)
+	}
+}
+
+var ctxt = &build.Default
+
+func bundle(w io.Writer, initialPkg, dest, prefix string) error {
+	// Load the initial package.
+	conf := loader.Config{ParserMode: parser.ParseComments, Build: ctxt}
+	conf.TypeCheckFuncBodies = func(p string) bool { return p == initialPkg }
+	conf.Import(initialPkg)
+
+	lprog, err := conf.Load()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	info := lprog.Package(initialPkg)
+
+	objsToUpdate := make(map[types.Object]bool)
+	var rename func(from types.Object)
+	rename = func(from types.Object) {
+		if !objsToUpdate[from] {
+			objsToUpdate[from] = true
+
+			// Renaming a type that is used as an embedded field
+			// requires renaming the field too. e.g.
+			// 	type T int // if we rename this to U..
+			// 	var s struct {T}
+			// 	print(s.T) // ...this must change too
+			if _, ok := from.(*types.TypeName); ok {
+				for id, obj := range info.Uses {
+					if obj == from {
+						if field := info.Defs[id]; field != nil {
+							rename(field)
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// Rename each package-level object.
+	scope := info.Pkg.Scope()
+	for _, name := range scope.Names() {
+		rename(scope.Lookup(name))
+	}
+
+	var out bytes.Buffer
+
+	fmt.Fprintf(&out, "// Code generated by golang.org/x/tools/cmd/bundle command:\n")
+	fmt.Fprintf(&out, "//   $ bundle %s %s %s\n\n", initialPkg, dest, prefix)
+
+	// Concatenate package comments from of all files.
+	for _, f := range info.Files {
+		if doc := f.Doc.Text(); strings.TrimSpace(doc) != "" {
+			for _, line := range strings.Split(doc, "\n") {
+				fmt.Fprintf(&out, "// %s\n", line)
+			}
+		}
+	}
+
+	// TODO(adonovan): don't assume pkg.name == basename(pkg.path).
+	fmt.Fprintf(&out, "package %s\n\n", filepath.Base(dest))
+
+	// Print a single declaration that imports all necessary packages.
+	// TODO(adonovan):
+	// - support renaming imports.
+	// - preserve comments from the original import declarations.
+	for _, f := range info.Files {
+		for _, imp := range f.Imports {
+			if imp.Name != nil {
+				log.Fatalf("%s: renaming imports not supported",
+					lprog.Fset.Position(imp.Pos()))
+			}
+		}
+	}
+	fmt.Fprintln(&out, "import (")
+	for _, p := range info.Pkg.Imports() {
+		if p.Path() == dest {
+			continue
+		}
+		fmt.Fprintf(&out, "\t%q\n", p.Path())
+	}
+	fmt.Fprintln(&out, ")\n")
+
+	// Modify and print each file.
+	for _, f := range info.Files {
+		// Update renamed identifiers.
+		for id, obj := range info.Defs {
+			if objsToUpdate[obj] {
+				id.Name = prefix + obj.Name()
+			}
+		}
+		for id, obj := range info.Uses {
+			if objsToUpdate[obj] {
+				id.Name = prefix + obj.Name()
+			}
+		}
+
+		// For each qualified identifier that refers to the
+		// destination package, remove the qualifier.
+		// The "@@@." strings are removed in postprocessing.
+		ast.Inspect(f, func(n ast.Node) bool {
+			if sel, ok := n.(*ast.SelectorExpr); ok {
+				if id, ok := sel.X.(*ast.Ident); ok {
+					if obj, ok := info.Uses[id].(*types.PkgName); ok {
+						if obj.Imported().Path() == dest {
+							id.Name = "@@@"
+						}
+					}
+				}
+			}
+			return true
+		})
+
+		// Pretty-print package-level declarations.
+		// but no package or import declarations.
+		//
+		// TODO(adonovan): this may cause loss of comments
+		// preceding or associated with the package or import
+		// declarations or not associated with any declaration.
+		// Check.
+		var buf bytes.Buffer
+		for _, decl := range f.Decls {
+			if decl, ok := decl.(*ast.GenDecl); ok && decl.Tok == token.IMPORT {
+				continue
+			}
+			buf.Reset()
+			format.Node(&buf, lprog.Fset, decl)
+			// Remove each "@@@." in the output.
+			// TODO(adonovan): not hygienic.
+			out.Write(bytes.Replace(buf.Bytes(), []byte("@@@."), nil, -1))
+			out.WriteString("\n\n")
+		}
+	}
+
+	// Now format the entire thing.
+	result, err := format.Source(out.Bytes())
+	if err != nil {
+		log.Fatalf("formatting failed: %v", err)
+	}
+
+	_, err = w.Write(result)
+	return err
+}
diff --git a/cmd/bundle/main_test.go b/cmd/bundle/main_test.go
new file mode 100644
index 00000000..b4d0810f
--- /dev/null
+++ b/cmd/bundle/main_test.go
@@ -0,0 +1,66 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	"bytes"
+	"io/ioutil"
+	"os/exec"
+	"runtime"
+	"testing"
+
+	"golang.org/x/tools/go/buildutil"
+)
+
+func TestBundle(t *testing.T) {
+	load := func(name string) string {
+		data, err := ioutil.ReadFile(name)
+		if err != nil {
+			t.Fatal(err)
+		}
+		return string(data)
+	}
+
+	ctxt = buildutil.FakeContext(map[string]map[string]string{
+		"initial": {
+			"a.go": load("testdata/src/initial/a.go"),
+			"b.go": load("testdata/src/initial/b.go"),
+		},
+		"fmt": {
+			"print.go": `package fmt; func Println(...interface{})`,
+		},
+	})
+
+	var out bytes.Buffer
+	if err := bundle(&out, "initial", "dest", "prefix"); err != nil {
+		t.Fatal(err)
+	}
+	if got, want := out.String(), load("testdata/out.golden"); got != want {
+		t.Errorf("-- got --\n%s\n-- want --\n%s\n-- diff --", got, want)
+
+		if err := ioutil.WriteFile("testdata/out.got", out.Bytes(), 0644); err != nil {
+			t.Fatal(err)
+		}
+		t.Log(diff("testdata/out.got", "testdata/out.golden"))
+	}
+}
+
+func diff(a, b string) string {
+	var cmd *exec.Cmd
+	switch runtime.GOOS {
+	case "plan9":
+		cmd = exec.Command("/bin/diff", "-c", a, b)
+	default:
+		cmd = exec.Command("/usr/bin/diff", "-u", a, b)
+	}
+	var out bytes.Buffer
+	cmd.Stdout = &out
+	cmd.Stderr = &out
+	cmd.Run() // nonzero exit is expected
+	if out.Len() == 0 {
+		return "(failed to compute diff)"
+	}
+	return out.String()
+}
diff --git a/cmd/bundle/testdata/out.golden b/cmd/bundle/testdata/out.golden
new file mode 100644
index 00000000..e8c439ae
--- /dev/null
+++ b/cmd/bundle/testdata/out.golden
@@ -0,0 +1,30 @@
+// Code generated by golang.org/x/tools/cmd/bundle command:
+//   $ bundle initial dest prefix
+
+// The package doc comment
+//
+package dest
+
+import (
+	"fmt"
+)
+
+// init functions are not renamed
+func init() { prefixfoo() }
+
+// Type S.
+type prefixS struct {
+	prefixt
+	u int
+}
+
+// Function bar.
+func prefixbar(s *prefixS) { fmt.Println(s.prefixt, s.u) }
+
+type prefixt int
+
+const prefixc = 1
+
+func prefixfoo() {
+	fmt.Println()
+}
diff --git a/cmd/bundle/testdata/src/initial/a.go b/cmd/bundle/testdata/src/initial/a.go
new file mode 100644
index 00000000..99cd145a
--- /dev/null
+++ b/cmd/bundle/testdata/src/initial/a.go
@@ -0,0 +1,15 @@
+package initial
+
+import "fmt"
+
+// init functions are not renamed
+func init() { foo() }
+
+// Type S.
+type S struct {
+	t
+	u int
+}
+
+// Function bar.
+func bar(s *S) { fmt.Println(s.t, s.u) }
diff --git a/cmd/bundle/testdata/src/initial/b.go b/cmd/bundle/testdata/src/initial/b.go
new file mode 100644
index 00000000..399b6ede
--- /dev/null
+++ b/cmd/bundle/testdata/src/initial/b.go
@@ -0,0 +1,12 @@
+// The package doc comment
+package initial
+
+import "fmt"
+
+type t int
+
+const c = 1
+
+func foo() {
+	fmt.Println()
+}