diff --git a/pkgs/development/compilers/go/remove-tools-1.5.patch b/pkgs/development/compilers/go/remove-tools-1.5.patch
index 00f4fac7476a..5aad4b4abc3f 100644
--- a/pkgs/development/compilers/go/remove-tools-1.5.patch
+++ b/pkgs/development/compilers/go/remove-tools-1.5.patch
@@ -1,22 +1,10 @@
 diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
-index 61e3d8d..f8475f4 100644
+index 61e3d8d..b8422ad 100644
 --- a/src/cmd/go/pkg.go
 +++ b/src/cmd/go/pkg.go
-@@ -665,7 +665,7 @@ var goTools = map[string]targetDir{
- 	"cmd/asm":                              toTool,
- 	"cmd/compile":                          toTool,
- 	"cmd/cgo":                              toTool,
--	"cmd/cover":                            toTool,
-+	"nixos.org/x/tools/cmd/cover":          toTool,
- 	"cmd/dist":                             toTool,
- 	"cmd/doc":                              toTool,
- 	"cmd/fix":                              toTool,
-@@ -676,9 +676,9 @@ var goTools = map[string]targetDir{
- 	"cmd/pack":                             toTool,
- 	"cmd/pprof":                            toTool,
+@@ -678,7 +678,7 @@ var goTools = map[string]targetDir{
  	"cmd/trace":                            toTool,
--	"cmd/vet":                              toTool,
-+	"nixos.org/x/tools/cmd/vet":            toTool,
+ 	"cmd/vet":                              toTool,
  	"cmd/yacc":                             toTool,
 -	"golang.org/x/tools/cmd/godoc":         toBin,
 +	"nixos.org/x/tools/cmd/godoc":          toBin,
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 70a8c1770d17..cb7feb8cbf99 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -118,11 +118,11 @@ let
   };
 
   tools = buildFromGitHub {
-    rev = "93604a3dc2a5ae0168456c672ec35cc90ea881e6";
-    date = "2015-08-19";
+    rev = "b48dc8da98ae78c3d11f220e7d327304c84e623a";
+    date = "2015-08-24";
     owner = "golang";
     repo = "tools";
-    sha256 = "1yd3hwsbsjrmx85nihss55wy91y8sld7p0599j5k9xi0n1mrxdci";
+    sha256 = "187p3jjxrw2qjnzqwwrq7f9w10zh6vcnwnfl3q7ms8rbiffpjy5c";
     goPackagePath = "golang.org/x/tools";
     goPackageAliases = [ "code.google.com/p/go.tools" ];
 
@@ -136,7 +136,9 @@ let
       export GOTOOLDIR=$out/bin
     '';
 
-    excludedPackages = "testdata";
+    excludedPackages = "\\("
+      + stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ])
+      + "\\)";
 
     buildInputs = [ net ];