diff --git a/extra/go/build b/extra/go/build
index ecad88bc..9b67e040 100755
--- a/extra/go/build
+++ b/extra/go/build
@@ -1,10 +1,11 @@
 #!/bin/sh -e
 
 export GOARCH=amd64
+export GO_LDFLAGS="-w -s"
 
-[ -f /var/db/kiss/installed/go/manifest ] || {
-    export GOROOT="$PWD/go1.4-bootstrap"
-    export GOROOT_FINAL="$PWD/lib/go-bootstrap"
+[ -f "$KISS_ROOT/var/db/kiss/installed/go/manifest" ] || {
+    export GOROOT=$PWD/go1.4-bootstrap
+    export GOROOT_FINAL=$PWD/lib/go-bootstrap
 
     mkdir -p lib/go-bootstrap
 
@@ -17,13 +18,13 @@ export GOARCH=amd64
 
 export GOROOT_FINAL=/usr/lib/go
 
-if [ -f /var/db/kiss/go/manifest ]; then
+if [ -f "$KISS_ROOT/var/db/kiss/go/manifest" ]; then
     export GOROOT_BOOTSTRAP=/usr/lib/go
 else
-    export GOROOT_BOOTSTRAP="$PWD/lib/go-bootstrap"
+    export GOROOT_BOOTSTRAP=$PWD/lib/go-bootstrap
 fi
 
-export GOROOT="$PWD/go-current"
+export GOROOT=$PWD/go-current
 
 (
     cd "$GOROOT/src"
@@ -32,20 +33,32 @@ export GOROOT="$PWD/go-current"
 
 cd "$GOROOT"
 
-mkdir -p "$1/usr/bin" "$1/usr/lib/go/bin" "$1/usr/share/doc/go"
+mkdir -p "$1/usr/bin" "$1/usr/lib/go/bin"
 
-for binary in go gofmt; do
-    install -m755 "bin/$binary" "$1/usr/lib/go/bin/$binary"
-    ln -s "/usr/lib/go/bin/$binary" "$1/usr/bin"
-done
+install -m755 "bin/go"    "$1/usr/lib/go/bin/go"
+install -m755 "bin/gofmt" "$1/usr/lib/go/bin/gofmt"
 
-cp -a pkg src lib "$1/usr/lib/go"
-cp -r doc misc "$1/usr/share/doc/go"
+ln -s "/usr/lib/go/bin/go"    "$1/usr/bin"
+ln -s "/usr/lib/go/bin/gofmt" "$1/usr/bin"
 
-ln -s /usr/share/doc/go/doc "$1/usr/lib/go/doc"
-ln -s /usr/share/doc/go/misc "$1/usr/lib/go/misc"
+cp -a misc pkg src lib "$1/usr/lib/go"
 
+# Remove unneeded files.
 rm -f  "$1/usr/share/go/doc/articles/wiki/get.bin"
-rm -f  "$1/usr/lib/go/pkg/tool/*/api"
+rm -f  "$1/usr/lib/go/pkg/tool/"*/api
 rm -rf "$1/usr/lib/go/pkg/bootstrap"
 rm -rf "$1/usr/lib/go/pkg/obj"
+rm -rf "$1/usr/lib/go/pkg/obj/go-build/"*
+
+cd "$1/usr/lib/go/src"
+
+# Remove tests.
+find . -type f -a -name \*_test.go -delete
+find . -type f -a -name \*.bash    -delete
+find . -type f -a -name \*.bat     -delete
+find . -type f -a -name \*.rc      -delete
+
+find . -type d -a -name testdata |
+    while read -r dir; do
+        rm -rf "$dir"
+    done
diff --git a/extra/go/version b/extra/go/version
index b9dbdc5d..6ad976a6 100644
--- a/extra/go/version
+++ b/extra/go/version
@@ -1 +1 @@
-1.12.9 1
+1.12.9 2