diff --git a/prosodyctl b/prosodyctl
index 9f62963ba..c08c9e7d6 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -662,7 +662,14 @@ local command_runner = async.runner(function ()
 				"start"; "stop"; "restart"; "reload"; "status";
 			"Informative:",
 				"about",
+				"check",
 		};
+		-- These live in util.prosodyctl.$command so we have their short help here.
+		local external_commands = {
+			cert = "Manage certificates",
+			check = "Perform basic checks on your Prosody installation",
+			shell = "Lorem ipsum dolor sit amet", -- FIXME
+		}
 
 		local done = {};
 
@@ -671,6 +678,9 @@ local command_runner = async.runner(function ()
 			if command_func then
 				command_func{ "--help" };
 				done[command_name] = true;
+			elseif external_commands[command_name] then
+				show_usage(command_name, external_commands[command_name]);
+				done[command_name] = true;
 			else
 				print""
 				print(command_name);