diff --git a/src/p7/args.c b/src/p7/args.c
index 701fd3d..be4cbf8 100644
--- a/src/p7/args.c
+++ b/src/p7/args.c
@@ -19,7 +19,8 @@
 /* ************************************************************************** */
 /* Version message */
 static const char version_message[] =
-QUOTE(BIN) " - from " QUOTE(NAME) " v" QUOTE(VERSION) " (licensed under GPLv2)\n"
+QUOTE(BIN) " - from " QUOTE(NAME) " v" QUOTE(VERSION)
+	" (licensed under GPLv2)\n"
 "Maintained by " QUOTE(MAINTAINER) ".\n"
 "\n"
 "This is free software; see the source for copying conditions.\n"
diff --git a/src/p7servtest/args.c b/src/p7servtest/args.c
index 6ae47fb..9b99549 100644
--- a/src/p7servtest/args.c
+++ b/src/p7servtest/args.c
@@ -17,7 +17,8 @@
 /* ************************************************************************** */
 /* Version message */
 static const char version_message[] =
-QUOTE(BIN) " v" QUOTE(VERSION) " (licensed under GPLv2)\n"
+QUOTE(BIN) " - from " QUOTE(NAME) " v" QUOTE(VERSION)
+	" (licensed under GPLv2)\n"
 "Maintained by " QUOTE(MAINTAINER) ".\n"
 "\n"
 "This is free software; see the source for copying conditions.\n"
@@ -28,6 +29,9 @@ QUOTE(BIN) " v" QUOTE(VERSION) " (licensed under GPLv2)\n"
 static const char help_main[] =
 "Usage: " QUOTE(BIN) " [--help] [--version]\n"
 "\n"
+"This utility is only there to test the libp7 server feature.\n"
+"It should not be used in production for anything else.\n"
+"\n"
 "General options:\n"
 "  -h, --help        Display the help page of the (sub)command and quit.\n"
 "  -v, --version     Display the version message and quit.\n"