diff --git a/src/go/build/build.go b/src/go/build/build.go
index 496fe11724..ce90f597fd 100644
--- a/src/go/build/build.go
+++ b/src/go/build/build.go
@@ -298,7 +298,7 @@ func defaultContext() Context {
 	// in all releases >= Go 1.x. Code that requires Go 1.x or later should
 	// say "+build go1.x", and code that should only be built before Go 1.x
 	// (perhaps it is the stub to use in that case) should say "+build !go1.x".
-	c.ReleaseTags = []string{"go1.1", "go1.2", "go1.3", "go1.4", "go1.5"}
+	c.ReleaseTags = []string{"go1.1", "go1.2", "go1.3", "go1.4", "go1.5", "go1.6"}
 
 	switch os.Getenv("CGO_ENABLED") {
 	case "1":
diff --git a/src/go/build/doc.go b/src/go/build/doc.go
index 233f8b989d..d436d28b31 100644
--- a/src/go/build/doc.go
+++ b/src/go/build/doc.go
@@ -102,6 +102,7 @@
 //	- "go1.3", from Go version 1.3 onward
 //	- "go1.4", from Go version 1.4 onward
 //	- "go1.5", from Go version 1.5 onward
+//	- "go1.6", from Go version 1.6 onward
 //	- any additional words listed in ctxt.BuildTags
 //
 // If a file's name, after stripping the extension and a possible _test suffix,