diff --git a/src/db.c b/src/db.c
index e35dc50..de0871c 100644
--- a/src/db.c
+++ b/src/db.c
@@ -337,7 +337,7 @@ db_query (
 #if 1 && defined(BOOKMARKFS_DEBUG)
     {
         char *sql = sqlite3_expanded_sql(stmt);
-        debug_printf("%s", sql);
+        debug_puts(sql);
         sqlite3_free(sql);
     }
 #endif
diff --git a/src/fsck_handler_tcl.c b/src/fsck_handler_tcl.c
index 17567a7..74ab059 100644
--- a/src/fsck_handler_tcl.c
+++ b/src/fsck_handler_tcl.c
@@ -103,7 +103,7 @@ init_handler (
     int result = Tcl_EvalEx(interp, buf, stat_buf.st_size, TCL_EVAL_GLOBAL);
     munmap(buf, stat_buf.st_size);
     if (result != TCL_OK) {
-        log_printf("%s", Tcl_GetStringResult(interp));
+        log_puts(Tcl_GetStringResult(interp));
         return -1;
     }
     close(ctx->script.fd);
@@ -121,7 +121,7 @@ init_interp (
     Tcl_Interp *interp = Tcl_CreateInterp();
     if (flags & FSCK_HANDLER_UNSAFE) {
         if (TCL_OK != Tcl_Init(interp)) {
-            log_printf("%s", Tcl_GetStringResult(interp));
+            log_puts(Tcl_GetStringResult(interp));
             goto fail;
         }
         Tcl_InitMemory(interp);
@@ -134,7 +134,7 @@ init_interp (
     if (NULL == Tcl_CreateNamespace(interp, WITH_NAMESPACE(name),  \
                 NULL, NULL)                                        \
     ) {                                                            \
-        log_printf("%s", Tcl_GetStringResult(interp));             \
+        log_puts(Tcl_GetStringResult(interp));                     \
         goto fail;                                                 \
     }
     DO_CREATE_NAMESPACE(interp, "handler");
@@ -142,7 +142,7 @@ init_interp (
 
 #define DO_SET_VAR(interp, name, val)                                        \
     if (0 != set_tcl_var(interp, STR_WITHLEN(WITH_NAMESPACE(name)), val)) {  \
-        log_printf("%s", Tcl_GetStringResult(interp));                       \
+        log_puts(Tcl_GetStringResult(interp));                               \
         goto fail;                                                           \
     }
     DO_SET_VAR(interp, "isInteractive",
@@ -337,7 +337,7 @@ fsck_handler_run (
     int result = Tcl_EvalObjv(interp, 2, args, TCL_EVAL_GLOBAL);
     Tcl_DecrRefCount(args_obj);
     if (result != TCL_OK) {
-        log_printf("%s", Tcl_GetStringResult(interp));
+        log_puts(Tcl_GetStringResult(interp));
         return -1;
     }
 
diff --git a/src/xstd.h b/src/xstd.h
index 72f39c4..9720be3 100644
--- a/src/xstd.h
+++ b/src/xstd.h
@@ -65,7 +65,7 @@
 
 #ifdef BOOKMARKFS_DEBUG
 #  define debug_printf(f, ...)  log_printf("[debug] " f, __VA_ARGS__)
-#  define debug_puts(s)         log_puts("[debug] " s)
+#  define debug_puts(s)         debug_printf("%s", s)
 #else
 #  define debug_printf(f, ...)
 #  define debug_puts(s)