diff --git a/src/make.bat b/src/make.bat
index 8f434708196761b0acc1c7b0014066c03b6cfb7e..29a9cce888986f99fe529f4eb3f742320aa34365 100644
--- a/src/make.bat
+++ b/src/make.bat
@@ -89,14 +89,16 @@ if not exist "%GOROOT_BOOTSTRAP%\bin\go.exe" goto bootstrapfail
 set GOROOT=%GOROOT_TEMP%
 set GOROOT_TEMP=
 
-echo Building Go cmd/dist using %GOROOT_BOOTSTRAP%
-if x%vflag==x-v echo cmd/dist
 setlocal
-set GOROOT=%GOROOT_BOOTSTRAP%
 set GOOS=
 set GOARCH=
-set GOBIN=
 set GOEXPERIMENT=
+for /f "tokens=*" %%g IN ('%GOROOT_BOOTSTRAP%\bin\go version') do (set GOROOT_BOOTSTRAP_VERSION=%%g)
+set GOROOT_BOOTSTRAP_VERSION=%GOROOT_BOOTSTRAP_VERSION:go version =%
+echo Building Go cmd/dist using %GOROOT_BOOTSTRAP%. (%GOROOT_BOOTSTRAP_VERSION%)
+if x%vflag==x-v echo cmd/dist
+set GOROOT=%GOROOT_BOOTSTRAP%
+set GOBIN=
 set GO111MODULE=off
 set GOENV=off
 set GOFLAGS=
diff --git a/src/make.rc b/src/make.rc
index 4597403a041366e1bfd4c7e3defce3605c5120ba..d9c7f2d8170a9ac666fe7db69501025c2e09bfd8 100755
--- a/src/make.rc
+++ b/src/make.rc
@@ -81,7 +81,11 @@ if(~ $GOROOT_BOOTSTRAP $GOROOT){
 	exit bootstrap
 }
 
-echo 'Building Go cmd/dist using '^$GOROOT_BOOTSTRAP
+# Get the exact bootstrap toolchain version to help with debugging.
+# We clear GOOS and GOARCH to avoid an ominous but harmless warning if
+# the bootstrap doesn't support them.
+GOROOT_BOOTSTRAP_VERSION=`{GOOS='' GOARCH='' GOEXPERIMENT='' $GOROOT_BOOTSTRAP/bin/go version | sed 's/go version //'}
+echo 'Building Go cmd/dist using '$GOROOT_BOOTSTRAP'. ('$"GOROOT_BOOTSTRAP_VERSION')'
 if(~ $#vflag 1)
 	echo cmd/dist
 GOROOT=$GOROOT_BOOTSTRAP GOOS='' GOARCH='' GOEXPERIMENT='' GO111MODULE=off GOENV=off GOFLAGS='' $GOROOT_BOOTSTRAP/bin/go build -o cmd/dist/dist ./cmd/dist