diff --git a/namcap.py b/namcap.py
index b62a2fa..8940e88 100755
--- a/namcap.py
+++ b/namcap.py
@@ -41,16 +41,17 @@ def get_modules():
 def usage():
 	"""Display usage information"""
 	print("")
-	print("Usage: " + sys.argv[0] + " [OPTIONS] packages")
+	print("Usage: namcap [OPTIONS] packages")
 	print("")
 	print("Options are:")
 	print("    -L, --list                       : list available rules")
-	print("    -i                               : prints information (debug) responses from rules")
-	print("    -m                               : makes the output parseable (machine-readable)")
+	print("    -i, --info                       : prints information (debug) responses from rules")
+	print("    -m, --machine-readable           : makes the output parseable (machine-readable)")
 	print("    -e rulelist, --exclude=rulelist  : don't apply RULELIST rules to the package")
 	print("    -r rulelist, --rules=rulelist    : only apply RULELIST rules to the package")
-	print("    -t tags                          : use a custom tag file")
-	print("    -v version                       : print version and exit")
+	print("    -t filename, --tags=filename     : use a custom tag file")
+	print("    -v, --version                    : print version and exit")
+	print("    -h, --help                       : print help and exit")
 
 	sys.exit(2)