diff --git a/dashboard/buildlet/Makefile b/dashboard/buildlet/Makefile
index 689791049f4..61dcf36ba8b 100644
--- a/dashboard/buildlet/Makefile
+++ b/dashboard/buildlet/Makefile
@@ -12,3 +12,7 @@ buildlet.plan9-386: buildlet.go
 buildlet.windows-amd64: buildlet.go
 	GOOS=windows GOARCH=amd64 go build -o $@ --tags=buildlet
 	cat $@ | (cd ../coordinator/buildongce && go run create.go --write_object=go-builder-data/$@)
+
+buildlet.darwin-amd64: buildlet.go
+	GOOS=darwin GOARCH=amd64 go build -o $@ --tags=buildlet
+	cat $@ | (cd ../coordinator/buildongce && go run create.go --write_object=go-builder-data/$@)
diff --git a/dashboard/buildlet/buildlet.go b/dashboard/buildlet/buildlet.go
index 3991c48ef14..4a9047d43ce 100644
--- a/dashboard/buildlet/buildlet.go
+++ b/dashboard/buildlet/buildlet.go
@@ -48,6 +48,12 @@ var (
 )
 
 func defaultListenAddr() string {
+	if runtime.GOOS == "darwin" {
+		// Darwin will never run on GCE, so let's always
+		// listen on a high port (so we don't need to be
+		// root).
+		return ":5936"
+	}
 	if metadata.OnGCE() {
 		// In production, default to
 		return ":80"