diff --git a/cmd/buildlet/buildlet.go b/cmd/buildlet/buildlet.go
index 3095c1288..b7a9adc7a 100644
--- a/cmd/buildlet/buildlet.go
+++ b/cmd/buildlet/buildlet.go
@@ -222,6 +222,17 @@ func initGorootBootstrap() {
 	os.Setenv("GOROOT_BOOTSTRAP", filepath.Join(*workDir, "go1.4"))
 
 	if runtime.GOOS == "solaris" && runtime.GOARCH == "amd64" {
+		gbenv := os.Getenv("GO_BUILDER_ENV")
+		if strings.Contains(gbenv, "oracle") {
+			// Oracle Solaris; not OpenSolaris-based or
+			// Illumos-based.  Do nothing.
+			return
+		}
+
+		// Assume this is an OpenSolaris-based machine or a
+		// SmartOS/Illumos machine before GOOS=="illumos" split.  For
+		// these machines, the old Joyent builders need to get the
+		// bootstrap and some config fixed.
 		os.Setenv("PATH", os.Getenv("PATH")+":/opt/local/bin")
 		downloadBootstrapGoroot("/root/go-solaris-amd64-bootstrap", "https://storage.googleapis.com/go-builder-data/gobootstrap-solaris-amd64.tar.gz")
 	}
diff --git a/dashboard/builders.go b/dashboard/builders.go
index 0b3a2ae87..f862c967d 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -292,7 +292,7 @@ var Hosts = map[string]*HostConfig{
 		OwnerGithub: "binarycrusader",
 		IsReverse:   true,
 		ExpectNum:   1,
-		env:         []string{"GOROOT_BOOTSTRAP=/opt/local/go-solaris-amd64-bootstrap"},
+		env:         []string{"GOROOT_BOOTSTRAP=/opt/golang/go-solaris-amd64-bootstrap"},
 	},
 	"host-solaris-oracle-shawn": &HostConfig{
 		Notes:       "Oracle Solaris amd64 Development System",
@@ -300,7 +300,7 @@ var Hosts = map[string]*HostConfig{
 		OwnerGithub: "binarycrusader",
 		IsReverse:   true,
 		ExpectNum:   1,
-		env:         []string{"GOROOT_BOOTSTRAP=/opt/local/go-solaris-amd64-bootstrap"},
+		env:         []string{"GOROOT_BOOTSTRAP=/opt/golang/go-solaris-amd64-bootstrap"},
 	},
 	"host-linux-mips": &HostConfig{
 		Notes:       "Run by Brendan Kirby, imgtec.com",