diff --git a/README.md b/README.md
index dd088bf33..b5fcb8c61 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,9 @@ You can start `lightningd` with the following command:
 lightningd/lightningd --network=testnet --log-level=debug
 ```
 
+### Listing all commands:
+`cli/lighting-cli help` will print a table of the API and lists the following commands
+
 ### Opening a channel on the Bitcoin testnet
 
 First you need to transfer some funds to `lightningd` so that it can open a channel:
diff --git a/cli/lightning-cli.c b/cli/lightning-cli.c
index 584ba7dae..4cc8fb763 100644
--- a/cli/lightning-cli.c
+++ b/cli/lightning-cli.c
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
 	configdir_register_opts(ctx, &lightning_dir, &rpc_filename);
 
 	opt_register_noarg("--help|-h", opt_usage_and_exit,
-			   "<command> [<params>...]", "Show this message");
+			   "<command> [<params>...]", "Show this message\t use the command help (without hyphen) to get a list of all commands");
 	opt_register_version();
 
 	opt_early_parse(argc, argv, opt_log_stderr_exit);