diff --git a/src/helper/log.h b/src/helper/log.h
index 48b43d8ec..624aa29ce 100644
--- a/src/helper/log.h
+++ b/src/helper/log.h
@@ -85,6 +85,11 @@ extern int debug_level;
 		log_printfnl (LOG_INFO, __FILE__, __LINE__, __FUNCTION__, expr); \
 	} while(0)
 
+#define INFO_SAMELINE(expr ...) \
+	do { if (debug_level >= LOG_INFO) \
+		log_printf (LOG_INFO, __FILE__, __LINE__, __FUNCTION__, expr); \
+	} while(0)
+
 #define WARNING(expr ...) \
 	do { \
 		log_printfnl (LOG_WARNING, __FILE__, __LINE__, __FUNCTION__, expr); \
diff --git a/src/helper/options.c b/src/helper/options.c
index 30dad17dd..6e1f10b77 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -48,7 +48,7 @@ static struct option long_options[] =
 
 int configuration_output_handler(struct command_context_s *context, char* line)
 {
-	INFO(line);
+	INFO_SAMELINE(line);
 
 	return ERROR_OK;
 }