diff --git a/cmd/pgcli/main.go b/cmd/pgcli/main.go
index c6d9443..ac3dadb 100644
--- a/cmd/pgcli/main.go
+++ b/cmd/pgcli/main.go
@@ -13,7 +13,7 @@ import (
 )
 
 var (
-	Version = "unknown"
+	Version = "dev"
 	Commit  = "unknown"
 )
 
@@ -33,6 +33,8 @@ func main() {
 		},
 	}
 
+	vpn.Version = Version
+	vpn.Commit = Commit
 	cmd.AddCommand(vpn.Cmd)
 	cmd.AddCommand(secret.Cmd)
 	cmd.AddCommand(curve25519.Cmd)
diff --git a/cmd/pgcli/vpn/vpn.go b/cmd/pgcli/vpn/vpn.go
index ed8774d..63cece6 100644
--- a/cmd/pgcli/vpn/vpn.go
+++ b/cmd/pgcli/vpn/vpn.go
@@ -26,12 +26,16 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var Cmd = &cobra.Command{
-	Use:   "vpn",
-	Short: "Run a vpn daemon which backend is PeerGuard p2p network",
-	Args:  cobra.NoArgs,
-	RunE:  run,
-}
+var (
+	Cmd = &cobra.Command{
+		Use:   "vpn",
+		Short: "Run a vpn daemon which backend is PeerGuard p2p network",
+		Args:  cobra.NoArgs,
+		RunE:  run,
+	}
+	Version = "dev"
+	Commit  string
+)
 
 func init() {
 	Cmd.Flags().StringP("ipv4", "4", "", "ipv4 address prefix (i.e. 100.99.0.1/24)")
@@ -162,6 +166,7 @@ func (v *P2PVPN) listenPacketConn() (c net.PacketConn, err error) {
 	disco.AddIgnoredLocalCIDRs(v.Config.AllowedIPs...)
 	p2pOptions := []p2p.Option{
 		p2p.PeerMeta("allowedIPs", v.Config.AllowedIPs),
+		p2p.PeerMeta("version", fmt.Sprintf("%s-%s", Version, Commit)),
 		p2p.ListenPeerUp(v.addPeer),
 	}