diff --git a/src/log.c b/src/log.c
index f5a0b44..2a3c6d8 100644
--- a/src/log.c
+++ b/src/log.c
@@ -70,7 +70,10 @@ static unsigned int logging_initialized = FALSE;     /* boolean */
  */
 int open_log_file (const char *log_file_name)
 {
-        log_file_fd = create_file_safely (log_file_name, FALSE);
+	if (config.godaemon == FALSE)
+		log_file_fd = fileno(stdout);
+	else
+		log_file_fd = create_file_safely (log_file_name, FALSE);
         return log_file_fd;
 }
 
@@ -79,7 +82,7 @@ int open_log_file (const char *log_file_name)
  */
 void close_log_file (void)
 {
-        if (log_file_fd < 0) {
+        if (log_file_fd < 0 || log_file_fd == fileno(stdout)) {
                 return;
         }
 
diff --git a/src/main.c b/src/main.c
index 50cacca..f606627 100644
--- a/src/main.c
+++ b/src/main.c
@@ -147,7 +147,7 @@ display_usage (void)
         printf ("Usage: %s [options]\n", PACKAGE);
         printf ("\n"
                 "Options are:\n"
-                "  -d        Do not daemonize (run in foreground).\n"
+                "  -d        Do not daemonize (run in foreground, log to stdout).\n"
                 "  -c FILE   Use an alternate configuration file.\n"
                 "  -h        Display this usage information.\n"
                 "  -l        Display the license.\n"