diff -r 279f343bbf6c -r fac51f87def0 src/server/daemon/log.c
--- a/src/server/daemon/log.c	Wed Jul 31 13:02:06 2013 +0200
+++ b/src/server/daemon/log.c	Sun Sep 08 23:27:07 2013 +0200
@@ -40,9 +40,10 @@
 #include "log.h"
 #include "../util/strbuf.h"
 #include "../util/io.h"
-#include "../ucx/map.h"
 #include "../util/atomic.h"
 
+#include <ucx/map.h>
+
 static int is_initialized = 0;
 
 static int log_file_fd;
@@ -236,7 +237,7 @@
     message.length = lpre.length + len;
     message.ptr = malloc(message.length + 1);
     
-    message = sstrncat(2, message, lpre, lmsg);
+    message = sstrncat(message, 2, lpre, lmsg);
     
     /* write message to the log file */ 
     log_file_writeln(message.ptr, message.length);