diff --git a/src/cmdline.c b/src/cmdline.c
index 85a156d..9146f0b 100644
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -632,46 +632,46 @@ static int input_output_files(opt_t *result, char *argv[], int optind)
 static void print_debug_info(opt_t *result)
 {
     if (result != NULL && is_debug_logging(MAIN)) {
-        log_debug(__FILE__, MAIN, "Command line option settings (excerpt):");
-        log_debug(__FILE__, MAIN, "- Alignment (-a): horiz %c, vert %c",
+        log_debug(__FILE__, MAIN, "Command line option settings (excerpt):\n");
+        log_debug(__FILE__, MAIN, "  - Alignment (-a): horiz %c, vert %c\n",
                 result->halign ? result->halign : '?', result->valign ? result->valign : '?');
-        log_debug(__FILE__, MAIN, "- Line justification (-a): \'%c\'\n", result->justify ? result->justify : '?');
-        log_debug(__FILE__, MAIN, "- Design Definition W shape (-c): %s\n", result->cld ? result->cld : "n/a");
-        log_debug(__FILE__, MAIN, "- Color mode: %d\n", result->color);
+        log_debug(__FILE__, MAIN, "  - Line justification (-a): \'%c\'\n", result->justify ? result->justify : '?');
+        log_debug(__FILE__, MAIN, "  - Design Definition W shape (-c): %s\n", result->cld ? result->cld : "n/a");
+        log_debug(__FILE__, MAIN, "  - Color mode: %d\n", result->color);
 
-        log_debug(__FILE__, MAIN, "- Debug areas: ");
+        log_debug(__FILE__, MAIN, "  - Debug areas: ");
         int dbgfirst = 1;
         for (size_t i = 0; i < NUM_LOG_AREAS; i++) {
             if (result->debug[i]) {
-                log_debug(__FILE__, MAIN, "%s%s", dbgfirst ? "" : ", ", log_area_names[i + 2]);
+                log_debug_cont(MAIN, "%s%s", dbgfirst ? "" : ", ", log_area_names[i + 2]);
                 dbgfirst = 0;
             }
         }
-        log_debug(__FILE__, MAIN, "%s\n", dbgfirst ? "(off)" : "");
+        log_debug_cont(MAIN, "%s\n", dbgfirst ? "(off)" : "");
 
-        log_debug(__FILE__, MAIN, "- Line terminator used (-e): %s\n",
+        log_debug(__FILE__, MAIN, "  - Line terminator used (-e): %s\n",
             strcmp(result->eol, "\r\n") == 0 ? "CRLF" : (strcmp(result->eol, "\r") == 0 ? "CR" : "LF"));
-        log_debug(__FILE__, MAIN, "- Explicit config file (-f): %s\n", result->f ? result->f : "no");
-        log_debug(__FILE__, MAIN, "- Indentmode (-i): \'%c\'\n", result->indentmode ? result->indentmode : '?');
-        log_debug(__FILE__, MAIN, "- Kill blank lines (-k): %d\n", result->killblank);
-        log_debug(__FILE__, MAIN, "- Mend box (-m): %d\n", result->mend);
-        log_debug(__FILE__, MAIN, "- Padding (-p): l:%d t:%d r:%d b:%d\n",
+        log_debug(__FILE__, MAIN, "  - Explicit config file (-f): %s\n", result->f ? result->f : "no");
+        log_debug(__FILE__, MAIN, "  - Indentmode (-i): \'%c\'\n", result->indentmode ? result->indentmode : '?');
+        log_debug(__FILE__, MAIN, "  - Kill blank lines (-k): %d\n", result->killblank);
+        log_debug(__FILE__, MAIN, "  - Mend box (-m): %d\n", result->mend);
+        log_debug(__FILE__, MAIN, "  - Padding (-p): l:%d t:%d r:%d b:%d\n",
                 result->padding[BLEF], result->padding[BTOP], result->padding[BRIG], result->padding[BBOT]);
 
-        log_debug(__FILE__, MAIN, "- Tag Query / Special handling for Web UI (-q): ");
+        log_debug(__FILE__, MAIN, "  - Tag Query / Special handling for Web UI (-q): ");
         if (result->query != NULL) {
             for (size_t qidx = 0; result->query[qidx] != NULL; ++qidx) {
-                fprintf(stderr, "%s%s", qidx > 0 ? ", " : "", result->query[qidx]);
+                log_debug_cont(MAIN, "%s%s", qidx > 0 ? ", " : "", result->query[qidx]);
             }
         } else {
-            log_debug(__FILE__, MAIN, "(none)");
+            log_debug_cont(MAIN, "(none)");
         }
-        log_debug(__FILE__, MAIN, "\n");
+        log_debug_cont(MAIN, "\n");
 
-        log_debug(__FILE__, MAIN, "- Remove box (-r): %d\n", result->r);
-        log_debug(__FILE__, MAIN, "- Requested box size (-s): %ldx%ld\n", result->reqwidth, result->reqheight);
-        log_debug(__FILE__, MAIN, "- Tabstop distance (-t): %d\n", result->tabstop);
-        log_debug(__FILE__, MAIN, "- Tab handling (-t): \'%c\'\n", result->tabexp);
+        log_debug(__FILE__, MAIN, "  - Remove box (-r): %d\n", result->r);
+        log_debug(__FILE__, MAIN, "  - Requested box size (-s): %ldx%ld\n", result->reqwidth, result->reqheight);
+        log_debug(__FILE__, MAIN, "  - Tabstop distance (-t): %d\n", result->tabstop);
+        log_debug(__FILE__, MAIN, "  - Tab handling (-t): \'%c\'\n", result->tabexp);
     }
 }