diff --git a/src/buildscript.sh b/src/buildscript.sh
index e6fec6c39ed..b61be731ffb 100755
--- a/src/buildscript.sh
+++ b/src/buildscript.sh
@@ -19,7 +19,7 @@ do
 
 export GOOS='$GOOS'
 export GOARCH='$GOARCH'
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 
diff --git a/src/buildscript_darwin_386.sh b/src/buildscript_darwin_386.sh
index 61f68dd38ff..ae4eb45867b 100755
--- a/src/buildscript_darwin_386.sh
+++ b/src/buildscript_darwin_386.sh
@@ -5,7 +5,7 @@
 
 export GOOS=darwin
 export GOARCH=386
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 
diff --git a/src/buildscript_darwin_amd64.sh b/src/buildscript_darwin_amd64.sh
index 3f6a183b044..06d7dbe00fe 100755
--- a/src/buildscript_darwin_amd64.sh
+++ b/src/buildscript_darwin_amd64.sh
@@ -5,7 +5,7 @@
 
 export GOOS=darwin
 export GOARCH=amd64
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 
diff --git a/src/buildscript_freebsd_386.sh b/src/buildscript_freebsd_386.sh
index c026051253b..3026508e955 100755
--- a/src/buildscript_freebsd_386.sh
+++ b/src/buildscript_freebsd_386.sh
@@ -5,7 +5,7 @@
 
 export GOOS=freebsd
 export GOARCH=386
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 
diff --git a/src/buildscript_freebsd_amd64.sh b/src/buildscript_freebsd_amd64.sh
index a811bb06909..955317252e8 100755
--- a/src/buildscript_freebsd_amd64.sh
+++ b/src/buildscript_freebsd_amd64.sh
@@ -5,7 +5,7 @@
 
 export GOOS=freebsd
 export GOARCH=amd64
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 
diff --git a/src/buildscript_linux_386.sh b/src/buildscript_linux_386.sh
index b17242f19ba..69bc6371e66 100755
--- a/src/buildscript_linux_386.sh
+++ b/src/buildscript_linux_386.sh
@@ -5,7 +5,7 @@
 
 export GOOS=linux
 export GOARCH=386
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 
diff --git a/src/buildscript_linux_amd64.sh b/src/buildscript_linux_amd64.sh
index 46cbd3a6825..22da2326c67 100755
--- a/src/buildscript_linux_amd64.sh
+++ b/src/buildscript_linux_amd64.sh
@@ -5,7 +5,7 @@
 
 export GOOS=linux
 export GOARCH=amd64
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 
diff --git a/src/buildscript_linux_arm.sh b/src/buildscript_linux_arm.sh
index e61abfa2301..d5b9550375a 100755
--- a/src/buildscript_linux_arm.sh
+++ b/src/buildscript_linux_arm.sh
@@ -5,7 +5,7 @@
 
 export GOOS=linux
 export GOARCH=arm
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 
diff --git a/src/buildscript_netbsd_386.sh b/src/buildscript_netbsd_386.sh
index dcd90db57b1..79cca220527 100755
--- a/src/buildscript_netbsd_386.sh
+++ b/src/buildscript_netbsd_386.sh
@@ -5,7 +5,7 @@
 
 export GOOS=netbsd
 export GOARCH=386
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 
diff --git a/src/buildscript_netbsd_amd64.sh b/src/buildscript_netbsd_amd64.sh
index a5b52acf87a..5a5637e5c8e 100755
--- a/src/buildscript_netbsd_amd64.sh
+++ b/src/buildscript_netbsd_amd64.sh
@@ -5,7 +5,7 @@
 
 export GOOS=netbsd
 export GOARCH=amd64
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 
diff --git a/src/buildscript_openbsd_386.sh b/src/buildscript_openbsd_386.sh
index 39bc0cbad4c..967d23f6b5d 100755
--- a/src/buildscript_openbsd_386.sh
+++ b/src/buildscript_openbsd_386.sh
@@ -5,7 +5,7 @@
 
 export GOOS=openbsd
 export GOARCH=386
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 
diff --git a/src/buildscript_openbsd_amd64.sh b/src/buildscript_openbsd_amd64.sh
index 2b9984f005a..a988738bc5a 100755
--- a/src/buildscript_openbsd_amd64.sh
+++ b/src/buildscript_openbsd_amd64.sh
@@ -5,7 +5,7 @@
 
 export GOOS=openbsd
 export GOARCH=amd64
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 
diff --git a/src/buildscript_plan9_386.sh b/src/buildscript_plan9_386.sh
index 78b894ce71f..1fb2cb272b8 100755
--- a/src/buildscript_plan9_386.sh
+++ b/src/buildscript_plan9_386.sh
@@ -5,7 +5,7 @@
 
 export GOOS=plan9
 export GOARCH=386
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 
diff --git a/src/buildscript_windows_386.sh b/src/buildscript_windows_386.sh
index b7602c0919e..f65e60e697d 100755
--- a/src/buildscript_windows_386.sh
+++ b/src/buildscript_windows_386.sh
@@ -5,7 +5,7 @@
 
 export GOOS=windows
 export GOARCH=386
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e
 
diff --git a/src/buildscript_windows_amd64.sh b/src/buildscript_windows_amd64.sh
index c15e9efdc3e..5e5c25edb59 100755
--- a/src/buildscript_windows_amd64.sh
+++ b/src/buildscript_windows_amd64.sh
@@ -5,7 +5,7 @@
 
 export GOOS=windows
 export GOARCH=amd64
-export WORK=$(mktemp -d -t go-build)
+export WORK=$(mktemp -d -t go-build.XXXXXX)
 trap "rm -rf $WORK" EXIT SIGINT SIGTERM
 set -e