diff --git a/src/lxc/log.c b/src/lxc/log.c
index 2f880e2750..1dd1aa8001 100644
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -41,6 +41,15 @@
 #define LXC_LOG_BUFFER_SIZE	512
 
 int lxc_log_fd = -1;
+#ifdef HAVE_TLS
+static __thread char log_prefix[LXC_LOG_PREFIX_SIZE] = "lxc";
+static __thread char *log_fname = NULL;
+/* command line values for logfile or logpriority should always override
+ * values from the configuration file or defaults
+ */
+static __thread int lxc_logfile_specified = 0;
+static __thread int lxc_loglevel_specified = 0;
+#else
 static char log_prefix[LXC_LOG_PREFIX_SIZE] = "lxc";
 static char *log_fname = NULL;
 /* command line values for logfile or logpriority should always override
@@ -48,6 +57,7 @@ static char *log_fname = NULL;
  */
 static int lxc_logfile_specified = 0;
 static int lxc_loglevel_specified = 0;
+#endif
 
 lxc_log_define(lxc_log, lxc);