diff --git a/llvm/tools/llvm-gsymutil/Opts.td b/llvm/tools/llvm-gsymutil/Opts.td
index 15e46881081759..740291479f9323 100644
--- a/llvm/tools/llvm-gsymutil/Opts.td
+++ b/llvm/tools/llvm-gsymutil/Opts.td
@@ -34,4 +34,4 @@ def quiet : FF<"quiet", "Do not output warnings about the debug information">;
 defm address : Eq<"address", "Lookup an address in a GSYM file">;
 def addresses_from_stdin :
   FF<"addresses-from-stdin",
-     "Emit a section containing remark diagnostics metadata. By default, this is enabled for the following formats: yaml-strtab, bitstream">;
+     "Lookup addresses in a GSYM file that are read from stdin\nEach input line is expected to be of the following format: <addr> <gsym-path>">;
diff --git a/llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp b/llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp
index 68d36f282dec03..307248ca347876 100644
--- a/llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp
+++ b/llvm/tools/llvm-gsymutil/llvm-gsymutil.cpp
@@ -172,7 +172,7 @@ static void parseArgs(int argc, char **argv) {
   for (const llvm::opt::Arg *A : Args.filtered(OPT_address_EQ)) {
     StringRef S{A->getValue()};
     if (!llvm::to_integer(S, LookupAddresses.emplace_back(), 0)) {
-      llvm::errs() << ToolName << ": for the --segment-size option: '" << S
+      llvm::errs() << ToolName << ": for the --address option: '" << S
                    << "' value invalid for uint argument!\n";
       std::exit(1);
     }