diff --git a/src/buildscript.sh b/src/buildscript.sh
index 1afdb69593d..905077c99a9 100755
--- a/src/buildscript.sh
+++ b/src/buildscript.sh
@@ -35,6 +35,8 @@ set -e
 		s/\$WORK/"$WORK"/g
 		s;"\$GOBIN"/go;&_bootstrap;g
 		s;\\;/;g
+		s/go_bootstrap-tool/go-tool/g
+		s;"\$GOBIN"/go-tool;"$GOROOT"/bin/go-tool;g
 	'
 	)>$targ
 	chmod +x $targ