diff --git a/Makefile b/Makefile
index ab0503f..e1edbf5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,25 @@
 # Build Go bootstrap toolchains from the modern source.
 # bash is expected to be on PATH
 
+GOROOT=		/usr/local/go
+
 GOOS=		freebsd
-GOARCH=		arm amd64 386
+GOARCH=		amd64 386 arm
 GOARM=		6 7
 
-UPLOAD_TARGET=	dmgk@freefall.freebsd.org:public_distfiles/go/
-
 all:
 .for goarch in ${GOARCH}
 .  if ${goarch} == arm
 .    for goarm in ${GOARM}
 	cd ${.CURDIR}/go/src ; \
-		env GOOS=${GOOS} GOARCH=${goarch} GOARM=${goarm} CGO_ENABLED=0 \
+		env GOROOT=${GOROOT} PATH=${GOROOT}/bin:$$PATH \
+		GOOS=${GOOS} GOARCH=${goarch} GOARM=${goarm} CGO_ENABLED=0 \
 		../../bootstrap.sh
 .    endfor
 .  else
 	cd ${.CURDIR}/go/src ; \
-		env GOOS=${GOOS} GOARCH=${goarch} GO386=387 CGO_ENABLED=0 \
+		env GOROOT=${GOROOT} PATH=${GOROOT}/bin:$$PATH \
+		GOOS=${GOOS} GOARCH=${goarch} GO386=387 CGO_ENABLED=0 \
 		../../bootstrap.sh
 .  endif
 .endfor
@@ -26,7 +28,7 @@ clean:
 	rm -rf go-*-bootstrap go-*.tar.xz
 
 upload:
-	cp -v go-*.tar.xz ~/ports/distfiles
-	# scp -p go-*.tar.xz ${UPLOAD_TARGET}
+	# todo
+	cp -pv go-*.tar.xz ~/ports/distfiles
 
 .PHONY: all clean upload