diff --git a/cmd/main.go b/cmd/main.go
index dda66cc..8fd3b52 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"encoding/json"
 	"flag"
+	"fmt"
 	"io"
 	"net/http"
 	"os"
@@ -42,8 +43,17 @@ func main() {
 	debPath := flag.String("debpath", "debs", "Path to directory containing deb files.")
 	httpUser := flag.String("httpuser", "debanator", "Username for HTTP basic auth")
 	httpPass := flag.String("httppass", "", "Enable HTTP basic auth with this password")
+	showVersion := flag.Bool("version", false, "Show version")
 	flag.Parse()
-	log.Info("Starting...")
+	if *showVersion {
+		fmt.Printf("debanator %s, (git#%s)\n", debanator.Version, debanator.Commit)
+		os.Exit(0)
+	}
+
+	log.WithFields(log.Fields{
+		"version": debanator.Version,
+		"commit": debanator.Commit,
+	}).Info("Starting debanator...")
 	var ecKey *crypto.Key
 	kb, err := os.ReadFile("privkey.gpg")
 	if err != nil {
diff --git a/version.go b/version.go
new file mode 100644
index 0000000..2391450
--- /dev/null
+++ b/version.go
@@ -0,0 +1,4 @@
+package debanator
+
+const Version = "unknown"
+const Commit = "unknown"