diff --git a/NEWS b/NEWS
index 6a6696b45..a1fa4eef5 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ ver 0.16 (20??/??/??)
   - added new "status" line with more precise "elapsed time"
 * log unused/unknown block parameters
 * save state when stopped
+* renamed option "--stdout" to "--stderr"
 
 
 ver 0.15 (2009/06/23)
diff --git a/doc/mpd.1 b/doc/mpd.1
index f2fd2286f..22c0e7510 100644
--- a/doc/mpd.1
+++ b/doc/mpd.1
@@ -34,8 +34,8 @@ Do not create database, even if it doesn't exist.
 .BI --no-daemon
 Don't detach from console.
 .TP
-.BI --stdout
-Print messages to stdout and stderr.
+.BI --stderr
+Print messages stderr.
 .TP
 .BI --verbose
 Verbose logging.
diff --git a/src/cmdline.c b/src/cmdline.c
index 5d2f10136..cb796ebab 100644
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -97,6 +97,8 @@ void parse_cmdline(int argc, char **argv, struct options *options)
 		{ "no-daemon", 0, 0, G_OPTION_ARG_NONE, &option_no_daemon,
 		  "don't detach from console", NULL },
 		{ "stdout", 0, 0, G_OPTION_ARG_NONE, &options->stderr,
+		  NULL, NULL },
+		{ "stderr", 0, 0, G_OPTION_ARG_NONE, &options->stderr,
 		  "print messages to stderr", NULL },
 		{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &options->verbose,
 		  "verbose logging", NULL },