diff --git a/README.md b/README.md
index 7e67ea9..4b11616 100644
--- a/README.md
+++ b/README.md
@@ -66,15 +66,15 @@ Usage:
   pgweb [OPTIONS]
 
 Application Options:
-  -v            Print version
-  -d            Enable debugging mode (false)
-      --url=    Database connection string
-      --host=   Server hostname or IP (localhost)
-      --port=   Server port (5432)
-      --user=   Database user (postgres)
-      --db=     Database name (postgres)
-      --ssl=    SSL option (disable)
-      --listen= HTTP server listen port (8080)
+  -v, --version  Print version
+  -d, --debug    Enable debugging mode (false)
+      --url=     Database connection string
+      --host=    Server hostname or IP (localhost)
+      --port=    Server port (5432)
+      --user=    Database user (postgres)
+      --db=      Database name (postgres)
+      --ssl=     SSL option (disable)
+      --listen=  HTTP server listen port (8080)
 ```
 
 ## Compile from source
diff --git a/main.go b/main.go
index 4f0daf8..4228c41 100644
--- a/main.go
+++ b/main.go
@@ -13,8 +13,8 @@ import (
 const VERSION = "0.3.0"
 
 var options struct {
-	Version  bool   `short:"v" description:"Print version"`
-	Debug    bool   `short:"d" description:"Enable debugging mode" default:"false"`
+	Version  bool   `short:"v" long:"version" description:"Print version"`
+	Debug    bool   `short:"d" long:"debug" description:"Enable debugging mode" default:"false"`
 	Url      string `long:"url" description:"Database connection string"`
 	Host     string `long:"host" description:"Server hostname or IP" default:"localhost"`
 	Port     int    `long:"port" description:"Server port" default:"5432"`