diff --git a/cmd/server/main.go b/cmd/server/main.go
index 330afec..25fc443 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -24,6 +24,13 @@ var (
 
 // Start the pomodoro server
 func Start() {
+	// Update usage output
+	flag.Usage = func() {
+		fmt.Fprintf(flag.CommandLine.Output(), "Usage of %s:\n", "GoTomato")
+		flag.PrintDefaults()
+		fmt.Println("\nPoint your client to 'ws://<listenAddress>:<listenPort>/ws'")
+	}
+
 	flag.Parse()
 
 	// show server and protocl version and exit