diff --git a/misc/nacl/testzip.proto b/misc/nacl/testzip.proto
index 8c14b87f0a5..8a8784c8be0 100644
--- a/misc/nacl/testzip.proto
+++ b/misc/nacl/testzip.proto
@@ -27,23 +27,23 @@ go	src=..
 			internal
 				objfile
 					objfile.go
-				unvendor
-					golang.org
-							x
-								arch
-									arm
-										armasm
-											testdata
-													+
-									x86
-										x86asm
-											testdata
-													+
 			gofmt
 				gofmt.go
 				gofmt_test.go
 				testdata
 					+
+			vendor
+				golang.org
+					x
+						arch
+							arm
+								armasm
+									testdata
+										+
+							x86
+								x86asm
+									testdata
+										+
 		archive
 			tar
 				testdata
diff --git a/src/cmd/internal/objfile/disasm.go b/src/cmd/internal/objfile/disasm.go
index d63f8f616f1..25c3301ab88 100644
--- a/src/cmd/internal/objfile/disasm.go
+++ b/src/cmd/internal/objfile/disasm.go
@@ -15,8 +15,8 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"cmd/internal/unvendor/golang.org/x/arch/arm/armasm"
-	"cmd/internal/unvendor/golang.org/x/arch/x86/x86asm"
+	"golang.org/x/arch/arm/armasm"
+	"golang.org/x/arch/x86/x86asm"
 )
 
 // Disasm is a disassembler for a given File.
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/Makefile b/src/cmd/vendor/golang.org/x/arch/arm/armasm/Makefile
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/Makefile
rename to src/cmd/vendor/golang.org/x/arch/arm/armasm/Makefile
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/decode.go b/src/cmd/vendor/golang.org/x/arch/arm/armasm/decode.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/decode.go
rename to src/cmd/vendor/golang.org/x/arch/arm/armasm/decode.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/decode_test.go b/src/cmd/vendor/golang.org/x/arch/arm/armasm/decode_test.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/decode_test.go
rename to src/cmd/vendor/golang.org/x/arch/arm/armasm/decode_test.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/ext_test.go b/src/cmd/vendor/golang.org/x/arch/arm/armasm/ext_test.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/ext_test.go
rename to src/cmd/vendor/golang.org/x/arch/arm/armasm/ext_test.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/gnu.go b/src/cmd/vendor/golang.org/x/arch/arm/armasm/gnu.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/gnu.go
rename to src/cmd/vendor/golang.org/x/arch/arm/armasm/gnu.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/inst.go b/src/cmd/vendor/golang.org/x/arch/arm/armasm/inst.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/inst.go
rename to src/cmd/vendor/golang.org/x/arch/arm/armasm/inst.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/objdump_test.go b/src/cmd/vendor/golang.org/x/arch/arm/armasm/objdump_test.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/objdump_test.go
rename to src/cmd/vendor/golang.org/x/arch/arm/armasm/objdump_test.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/objdumpext_test.go b/src/cmd/vendor/golang.org/x/arch/arm/armasm/objdumpext_test.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/objdumpext_test.go
rename to src/cmd/vendor/golang.org/x/arch/arm/armasm/objdumpext_test.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/plan9x.go b/src/cmd/vendor/golang.org/x/arch/arm/armasm/plan9x.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/plan9x.go
rename to src/cmd/vendor/golang.org/x/arch/arm/armasm/plan9x.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/tables.go b/src/cmd/vendor/golang.org/x/arch/arm/armasm/tables.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/tables.go
rename to src/cmd/vendor/golang.org/x/arch/arm/armasm/tables.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/testdata/Makefile b/src/cmd/vendor/golang.org/x/arch/arm/armasm/testdata/Makefile
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/testdata/Makefile
rename to src/cmd/vendor/golang.org/x/arch/arm/armasm/testdata/Makefile
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/testdata/decode.txt b/src/cmd/vendor/golang.org/x/arch/arm/armasm/testdata/decode.txt
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/arm/armasm/testdata/decode.txt
rename to src/cmd/vendor/golang.org/x/arch/arm/armasm/testdata/decode.txt
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/Makefile b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/Makefile
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/Makefile
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/Makefile
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/decode.go b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/decode.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/decode.go
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/decode.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/decode_test.go b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/decode_test.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/decode_test.go
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/decode_test.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/ext_test.go b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/ext_test.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/ext_test.go
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/ext_test.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/gnu.go b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/gnu.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/gnu.go
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/gnu.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/inst.go b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/inst.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/inst.go
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/inst.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/inst_test.go b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/inst_test.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/inst_test.go
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/inst_test.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/intel.go b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/intel.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/intel.go
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/intel.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/objdump_test.go b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/objdump_test.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/objdump_test.go
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/objdump_test.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/objdumpext_test.go b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/objdumpext_test.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/objdumpext_test.go
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/objdumpext_test.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/plan9ext_test.go b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9ext_test.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/plan9ext_test.go
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9ext_test.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/plan9x.go b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9x.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/plan9x.go
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9x.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/plan9x_test.go b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9x_test.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/plan9x_test.go
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/plan9x_test.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/tables.go b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/tables.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/tables.go
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/tables.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/testdata/Makefile b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/Makefile
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/testdata/Makefile
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/Makefile
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/testdata/decode.txt b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/decode.txt
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/testdata/decode.txt
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/decode.txt
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/testdata/libmach8db.c b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/libmach8db.c
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/testdata/libmach8db.c
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/testdata/libmach8db.c
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/xed_test.go b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/xed_test.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/xed_test.go
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/xed_test.go
diff --git a/src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/xedext_test.go b/src/cmd/vendor/golang.org/x/arch/x86/x86asm/xedext_test.go
similarity index 100%
rename from src/cmd/internal/unvendor/golang.org/x/arch/x86/x86asm/xedext_test.go
rename to src/cmd/vendor/golang.org/x/arch/x86/x86asm/xedext_test.go
diff --git a/src/cmd/internal/unvendor/vendor.json b/src/cmd/vendor/vendor.json
similarity index 100%
rename from src/cmd/internal/unvendor/vendor.json
rename to src/cmd/vendor/vendor.json