diff --git a/src/csync_reconcile.c b/src/csync_reconcile.c
index e57518d8c5..2a134c0303 100644
--- a/src/csync_reconcile.c
+++ b/src/csync_reconcile.c
@@ -243,14 +243,14 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
       if(cur->type == CSYNC_FTW_TYPE_DIR)
       {
         CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,
-        "%s  dir: %s",
+        "%-20s  dir: %s",
         csync_instruction_str(cur->instruction),
         cur->path);
       }
       else
       {
         CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,
-        "%s file: %s",
+        "%-20s file: %s",
         csync_instruction_str(cur->instruction),
         cur->path);   
       }
@@ -260,14 +260,14 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
       if(cur->type == CSYNC_FTW_TYPE_DIR)
       {
         CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
-        "%s  dir: %s",
+        "%-20s  dir: %s",
         csync_instruction_str(cur->instruction),
         cur->path);
       }
       else
       {
         CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
-        "%s file: %s",
+        "%-20s file: %s",
         csync_instruction_str(cur->instruction),
         cur->path);   
       }
diff --git a/src/csync_util.c b/src/csync_util.c
index e2bb70950d..68192f5b10 100644
--- a/src/csync_util.c
+++ b/src/csync_util.c
@@ -40,18 +40,18 @@ typedef struct {
 
 static const _instr_code_struct _instr[] =
 {
-  { "INSTRUCTION_NONE    ", CSYNC_INSTRUCTION_NONE },
-  { "INSTRUCTION_EVAL    ", CSYNC_INSTRUCTION_EVAL },
-  { "INSTRUCTION_REMOVE  ", CSYNC_INSTRUCTION_REMOVE },
-  { "INSTRUCTION_RENAME  ", CSYNC_INSTRUCTION_RENAME },
-  { "INSTRUCTION_NEW     ", CSYNC_INSTRUCTION_NEW },
+  { "INSTRUCTION_NONE", CSYNC_INSTRUCTION_NONE },
+  { "INSTRUCTION_EVAL", CSYNC_INSTRUCTION_EVAL },
+  { "INSTRUCTION_REMOVE", CSYNC_INSTRUCTION_REMOVE },
+  { "INSTRUCTION_RENAME", CSYNC_INSTRUCTION_RENAME },
+  { "INSTRUCTION_NEW", CSYNC_INSTRUCTION_NEW },
   { "INSTRUCTION_CONFLICT", CSYNC_INSTRUCTION_CONFLICT },
-  { "INSTRUCTION_IGNORE  ", CSYNC_INSTRUCTION_IGNORE },
-  { "INSTRUCTION_SYNC    ", CSYNC_INSTRUCTION_SYNC },
+  { "INSTRUCTION_IGNORE", CSYNC_INSTRUCTION_IGNORE },
+  { "INSTRUCTION_SYNC", CSYNC_INSTRUCTION_SYNC },
   { "INSTRUCTION_STAT_ERR", CSYNC_INSTRUCTION_STAT_ERROR },
-  { "INSTRUCTION_ERROR   ", CSYNC_INSTRUCTION_ERROR },
-  { "INSTRUCTION_DELETED ", CSYNC_INSTRUCTION_DELETED },
-  { "INSTRUCTION_UPDATED ", CSYNC_INSTRUCTION_UPDATED },
+  { "INSTRUCTION_ERROR", CSYNC_INSTRUCTION_ERROR },
+  { "INSTRUCTION_DELETED", CSYNC_INSTRUCTION_DELETED },
+  { "INSTRUCTION_UPDATED", CSYNC_INSTRUCTION_UPDATED },
   { NULL, CSYNC_INSTRUCTION_ERROR }
 };