diff --git a/build.sh b/build.sh
index e12d2b3ae..a429b9321 100755
--- a/build.sh
+++ b/build.sh
@@ -5,6 +5,9 @@ export COPYFILE_DISABLE=true
 distFiles=(README.md LICENSE) # apart from the binary itself
 version=$(git describe --always --dirty)
 date=$(date +%s)
+user=$(whoami)
+host=$(hostname -s)
+ldflags="-w -X main.Version $version -X main.BuildStamp $date -X main.BuildUser $user -X main.BuildHost $host"
 
 build() {
 	if command -v godep >/dev/null ; then
@@ -15,8 +18,8 @@ build() {
 		go get -d ./cmd/syncthing
 		godep=
 	fi
-	${godep} go build $* -ldflags "-w -X main.Version $version -X main.BuildStamp $date" ./cmd/syncthing
-	${godep} go build -ldflags "-w -X main.Version $version -X main.BuildStamp $date" ./cmd/stcli
+	${godep} go build $* -ldflags "$ldflags" ./cmd/syncthing
+	${godep} go build -ldflags "$ldflags" ./cmd/stcli
 }
 
 assets() {
diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go
index b5e86c098..ba0ffc76a 100644
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -32,6 +32,8 @@ var (
 	Version     = "unknown-dev"
 	BuildStamp  = "0"
 	BuildDate   time.Time
+	BuildHost   = "unknown"
+	BuildUser   = "unknown"
 	LongVersion string
 )
 
@@ -40,7 +42,7 @@ func init() {
 	BuildDate = time.Unix(int64(stamp), 0)
 
 	date := BuildDate.UTC().Format(time.RFC3339)
-	LongVersion = fmt.Sprintf("syncthing %s (%s %s-%s) %s", Version, runtime.Version(), runtime.GOOS, runtime.GOARCH, date)
+	LongVersion = fmt.Sprintf("syncthing %s (%s %s-%s) %s@%s %s", Version, runtime.Version(), runtime.GOOS, runtime.GOARCH, BuildUser, BuildHost, date)
 }
 
 var (