diff --git a/build.sh b/build.sh
index c782bf75..89848245 100755
--- a/build.sh
+++ b/build.sh
@@ -121,7 +121,7 @@ case "$1" in
 		godep go build ./cmd/stpidx
 		godep go build ./cmd/stcli
 
-		for os in darwin-amd64 linux-386 linux-amd64 freebsd-amd64 windows-amd64 windows-386 solaris-amd64 ; do
+		for os in darwin-amd64 linux-386 linux-amd64 freebsd-amd64 windows-amd64 windows-386 ; do
 			export GOOS=${os%-*}
 			export GOARCH=${os#*-}
 
diff --git a/cmd/syncthing/upgrade.go b/cmd/syncthing/upgrade.go
index 6b09f853..2ac2843b 100644
--- a/cmd/syncthing/upgrade.go
+++ b/cmd/syncthing/upgrade.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by an MIT-style license that can be
 // found in the LICENSE file.
 
-// +build !solaris
-
 package main
 
 import (
diff --git a/cmd/syncthing/upgrade_solaris.go b/cmd/syncthing/upgrade_solaris.go
deleted file mode 100644
index 0df2d0e2..00000000
--- a/cmd/syncthing/upgrade_solaris.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package main
-
-import "errors"
-
-func upgrade() error {
-	return errors.New("Upgrade currently unsupported on Solaris")
-}