diff --git a/common/log.c b/common/log.c
index 103aae80..c8703df8 100644
--- a/common/log.c
+++ b/common/log.c
@@ -591,8 +591,8 @@ log_message(const enum logLevels lvl, const char *msg, ...)
     {
         /* log to syslog*/
         /* %s fix compiler warning 'not a string literal' */
-        syslog(internal_log_xrdp2syslog(lvl), "(%d)(%ld)%s", g_getpid(),
-               (long) tc_get_threadid(), buff + 20);
+        syslog(internal_log_xrdp2syslog(lvl), "(%d)(%lld)%s", g_getpid(),
+               (long long) tc_get_threadid(), buff + 20);
     }
 
     if (lvl <= g_staticLogConfig->log_level)
diff --git a/xup/xup.c b/xup/xup.c
index 65ccc34c..ad0d896a 100644
--- a/xup/xup.c
+++ b/xup/xup.c
@@ -212,7 +212,8 @@ lib_mod_connect(struct mod *mod)
         if (trans_connect(mod->trans, mod->ip, con_port, 3000) == 0)
         {
             LLOGLN(0, ("lib_mod_connect: connected to Xserver "
-                   "(Xorg or X11rdp) sck %ld", (long) (mod->trans->sck)));
+                   "(Xorg or X11rdp) sck %lld",
+                   (long long) (mod->trans->sck)));
             error = 0;
         }