diff --git a/conformance/conformance_test_runner.cc b/conformance/conformance_test_runner.cc
index 5edb3c651e..35c33c63d7 100644
--- a/conformance/conformance_test_runner.cc
+++ b/conformance/conformance_test_runner.cc
@@ -123,9 +123,9 @@ void UsageError() {
           "                              strictly conforming to protobuf\n");
   fprintf(stderr, "                              spec.\n");
   fprintf(stderr,
-          "  --maximum edition           Only run conformance tests up to \n");
+          "  --maximum_edition <edition>   Only run conformance tests up\n");
   fprintf(stderr,
-          "                              and including the specified\n");
+          "                              to and including the specified\n");
   fprintf(stderr, "                              edition.\n");
   fprintf(stderr,
           "  --output_dir                <dirname> Directory to write\n"