diff --git a/README.md b/README.md
index 005944f9d57e..4942c537437f 100644
--- a/README.md
+++ b/README.md
@@ -208,7 +208,8 @@ options covering different styles. File an issue, or even better, submit a PR.
     ```
 * When you run rustfmt, place a file named `rustfmt.toml` or `.rustfmt.toml` in
   target file directory or its parents to override the default settings of
-  rustfmt.
+  rustfmt. You can generate a file containing the default configuration with
+  `rustfm --dump-default-config rustfmt.toml` and customize as needed.
 * After successful compilation, a `rustfmt` executable can be found in the
   target directory.
 * If you're having issues compiling Rustfmt (or compile errors when trying to
diff --git a/src/bin/rustfmt.rs b/src/bin/rustfmt.rs
index d1c04de83238..40ee8e70e94d 100644
--- a/src/bin/rustfmt.rs
+++ b/src/bin/rustfmt.rs
@@ -128,8 +128,7 @@ fn make_opts() -> Options {
     opts.opt(
         "",
         "dump-default-config",
-        "Dumps the default configuration to a file and exits. PATH defaults to rustfmt.toml if \
-         omitted.",
+	"Dumps default configuration to PATH. PATH defaults to stdout, if omitted."
         "PATH",
         HasArg::Maybe,
         Occur::Optional,