diff --git a/main.go b/main.go
index 4e537530..c16bae1c 100644
--- a/main.go
+++ b/main.go
@@ -14,6 +14,7 @@ import (
 var logger log.Logger = log.NullLogger
 var flagRestrict, flagDefaultTeam, flagDefaultServer *string
 var flagInsecure *bool
+var Version = "0.4-dev"
 
 func main() {
 	flagDebug := flag.Bool("debug", false, "enable debug logging")
@@ -23,6 +24,7 @@ func main() {
 	flagDefaultTeam = flag.String("mmteam", "", "specify default mattermost team")
 	flagDefaultServer = flag.String("mmserver", "", "specify default mattermost server/instance")
 	flagInsecure = flag.Bool("mminsecure", false, "use http connection to mattermost")
+	flagVersion := flag.Bool("version", false, "show version")
 	flag.Parse()
 
 	logger = golog.New(os.Stderr, log.Info)
@@ -30,6 +32,10 @@ func main() {
 		logger.Info("enabling debug")
 		logger = golog.New(os.Stderr, log.Debug)
 	}
+	if *flagVersion {
+		fmt.Println("Version:", Version)
+		return
+	}
 
 	irckit.SetLogger(logger)
 	socket, err := net.Listen("tcp", fmt.Sprintf("%s:%d", *flagBindInterface, *flagBindPort))
@@ -53,7 +59,7 @@ func start(socket net.Listener) {
 			cfg := &irckit.MmCfg{AllowedServers: strings.Fields(*flagRestrict),
 				DefaultTeam: *flagDefaultTeam, DefaultServer: *flagDefaultServer,
 				Insecure: *flagInsecure}
-			newsrv := irckit.ServerConfig{Name: "matterircd", Version: "0.3"}.Server()
+			newsrv := irckit.ServerConfig{Name: "matterircd", Version: Version}.Server()
 			logger.Infof("New connection: %s", conn.RemoteAddr())
 			err = newsrv.Connect(irckit.NewUserMM(conn, newsrv, cfg))
 			if err != nil {