diff --git a/server/usage.go b/etcd/v2_usage.go
similarity index 99%
rename from server/usage.go
rename to etcd/v2_usage.go
index 1ae0cb6ad..4575c60d6 100644
--- a/server/usage.go
+++ b/etcd/v2_usage.go
@@ -1,4 +1,4 @@
-package server
+package etcd
 
 import (
 	"strings"
diff --git a/main.go b/main.go
index 49a63f67a..56807bcb8 100644
--- a/main.go
+++ b/main.go
@@ -18,6 +18,7 @@ import (
 func main() {
 	var config = config.New()
 	if err := config.Load(os.Args[1:]); err != nil {
+		fmt.Println(etcd.Usage() + "\n")
 		fmt.Println(err.Error(), "\n")
 		os.Exit(1)
 	} else if config.ShowVersion {