diff --git a/src/cmdline.c b/src/cmdline.c
index cb796ebab..5216568fd 100644
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -96,9 +96,9 @@ void parse_cmdline(int argc, char **argv, struct options *options)
 		  "don't create database, even if it doesn't exist", NULL },
 		{ "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,
+		{ "stdout", 0, 0, G_OPTION_ARG_NONE, &options->log_stderr,
 		  NULL, NULL },
-		{ "stderr", 0, 0, G_OPTION_ARG_NONE, &options->stderr,
+		{ "stderr", 0, 0, G_OPTION_ARG_NONE, &options->log_stderr,
 		  "print messages to stderr", NULL },
 		{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &options->verbose,
 		  "verbose logging", NULL },
@@ -109,7 +109,7 @@ void parse_cmdline(int argc, char **argv, struct options *options)
 
 	options->kill = false;
 	options->daemon = true;
-	options->stderr = false;
+	options->log_stderr = false;
 	options->verbose = false;
 	options->create_db = 0;
 
diff --git a/src/cmdline.h b/src/cmdline.h
index fef1712d6..05bf73795 100644
--- a/src/cmdline.h
+++ b/src/cmdline.h
@@ -25,7 +25,7 @@
 struct options {
 	gboolean kill;
 	gboolean daemon;
-	gboolean stderr;
+	gboolean log_stderr;
 	gboolean verbose;
 	int create_db;
 };
diff --git a/src/main.c b/src/main.c
index 54b31c1f8..f7b3d2979 100644
--- a/src/main.c
+++ b/src/main.c
@@ -307,7 +307,7 @@ int main(int argc, char *argv[])
 
 	stats_global_init();
 	tag_lib_init();
-	log_init(options.verbose, options.stderr);
+	log_init(options.verbose, options.log_stderr);
 
 	listen_global_init();
 
@@ -347,7 +347,7 @@ int main(int argc, char *argv[])
 
 	daemonize(options.daemon);
 
-	setup_log_output(options.stderr);
+	setup_log_output(options.log_stderr);
 
 	initSigHandlers();