diff --git a/lib/mu-server.cc b/lib/mu-server.cc
index 76727ce0..15e52b6f 100644
--- a/lib/mu-server.cc
+++ b/lib/mu-server.cc
@@ -715,10 +715,10 @@ Server::Private::help_handler(const Command& cmd)
 	auto&& info_map{command_handler_.info_map()};
 
 	if (command.empty()) {
-		std::cout << ";; Commands are s-expressions of the form\n"
+		std::cout << ";; Commands are single-line s-expressions of the form\n"
 			  << ";;   (<command-name> :param1 val1 :param2 val2 ...)\n"
-			  << ";; For instance:\n;;  (help :command quit)\n"
-			  << ";; to get detailed information about the 'quit'\n;;\n";
+			  << ";; For instance:\n;;  (help :command mkdir)\n"
+			  << ";; to get detailed information about the 'mkdir' command\n;;\n";
 		std::cout << ";; The following commands are available:\n\n";
 	}
 
diff --git a/mu/mu-cmd-server.cc b/mu/mu-cmd-server.cc
index 08659a1b..35374703 100644
--- a/mu/mu-cmd-server.cc
+++ b/mu/mu-cmd-server.cc
@@ -137,7 +137,8 @@ Mu::mu_cmd_server(const Mu::Options& opts) try {
 	setup_readline(histpath, 50);
 
 	install_sig_handler();
-	std::cout << ";; Welcome to the " << PACKAGE_STRING << " command-server\n"
+	std::cout << ";; Welcome to the " << PACKAGE_STRING << " command-server"
+		  << (opts.debug ? " (debug-mode)" : "") << '\n'
 		  << ";; Use (help) to get a list of commands, (quit) to quit.\n";
 
 	bool do_quit{};