diff --git a/cmd/skipper/main.go b/cmd/skipper/main.go
index e2b17e4952..48bc89a747 100644
--- a/cmd/skipper/main.go
+++ b/cmd/skipper/main.go
@@ -17,6 +17,7 @@ package main
 import (
 	"fmt"
 	"runtime"
+	"runtime/debug"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/zalando/skipper"
@@ -28,6 +29,21 @@ var (
 	commit  string
 )
 
+func init() {
+	if info, ok := debug.ReadBuildInfo(); ok {
+		if version == "" {
+			version = info.Main.Version
+		}
+		if commit == "" {
+			for _, setting := range info.Settings {
+				if setting.Key == "vcs.revision" {
+					commit = setting.Value[:min(8, len(setting.Value))]
+				}
+			}
+		}
+	}
+}
+
 func main() {
 	cfg := config.NewConfig()
 	if err := cfg.Parse(); err != nil {