diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index e418963ff..a9e1c56a0 100644
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -306,10 +306,6 @@ void
 ParseCommandLine(int argc, char **argv, struct options *options)
 {
 	bool use_config_file = true;
-	options->kill = false;
-	options->daemon = true;
-	options->log_stderr = false;
-	options->verbose = false;
 
 	// First pass: handle command line options
 	OptionParser parser(option_defs, argc, argv);
diff --git a/src/CommandLine.hxx b/src/CommandLine.hxx
index 594a5fb36..1f270d757 100644
--- a/src/CommandLine.hxx
+++ b/src/CommandLine.hxx
@@ -21,10 +21,10 @@
 #define MPD_COMMAND_LINE_HXX
 
 struct options {
-	bool kill;
-	bool daemon;
-	bool log_stderr;
-	bool verbose;
+	bool kill = false;
+	bool daemon = true;
+	bool log_stderr = false;
+	bool verbose = false;
 };
 
 void