diff --git a/core/commands2/commands.go b/core/commands2/commands.go
index 0f102b2c4d28ced1c9bbc7f71d310a9135eb7bcf..f1d7f4fc69aa3b25bd1add745da9223b264a660e 100644
--- a/core/commands2/commands.go
+++ b/core/commands2/commands.go
@@ -13,7 +13,12 @@ type Command struct {
 }
 
 var commandsCmd = &cmds.Command{
-	Help: "TODO",
+	// TODO UsageLine: "commands",
+	// TODO Short:     "List all available commands.",
+	Help: `ipfs commands - List all available commands.
+
+    Lists all available commands (and sub-commands) and exits.
+  `,
 	Run: func(res cmds.Response, req cmds.Request) {
 		root := outputCommand("ipfs", Root)
 		res.SetOutput(&root)