diff --git a/cmd/discosrv/main.go b/cmd/discosrv/main.go
index ae3d3719..7dfea117 100644
--- a/cmd/discosrv/main.go
+++ b/cmd/discosrv/main.go
@@ -6,8 +6,11 @@ import (
 	"crypto/tls"
 	"database/sql"
 	"flag"
+	"fmt"
 	"log"
 	"os"
+	"runtime"
+	"strconv"
 	"time"
 
 	"github.com/syncthing/syncthing/lib/protocol"
@@ -20,6 +23,24 @@ const (
 	maxDeviceAge = 7 * 86400 // one week, in seconds
 )
 
+var (
+	Version    string
+	BuildStamp string
+	BuildUser  string
+	BuildHost  string
+
+	BuildDate   time.Time
+	LongVersion string
+)
+
+func init() {
+	stamp, _ := strconv.Atoi(BuildStamp)
+	BuildDate = time.Unix(int64(stamp), 0)
+
+	date := BuildDate.UTC().Format("2006-01-02 15:04:05 MST")
+	LongVersion = fmt.Sprintf(`discosrv %s (%s %s-%s) %s@%s %s`, Version, runtime.Version(), runtime.GOOS, runtime.GOARCH, BuildUser, BuildHost, date)
+}
+
 var (
 	lruSize     = 10240
 	limitAvg    = 5
@@ -58,6 +79,8 @@ func main() {
 	flag.BoolVar(&useHttp, "http", useHttp, "Listen on HTTP (behind an HTTPS proxy)")
 	flag.Parse()
 
+	log.Println(LongVersion)
+
 	var cert tls.Certificate
 	var err error
 	if !useHttp {