diff --git a/.gitignore b/.gitignore
index a59418dad..23c35078c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ compat_reports
 abi_dumps
 TAGS
 *~
+test-driver
diff --git a/Makefile.am b/Makefile.am
index 40c03419a..b9188013f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ AUTOMAKE_OPTIONS	= foreign
 MAINTAINERCLEANFILES	= Makefile.in aclocal.m4 configure depcomp \
 			  config.guess config.sub missing install-sh \
 			  autoheader automake autoconf libtool libtoolize \
-			  ltmain.sh compile
+			  ltmain.sh compile build-aux/test-driver
 
 
 ACLOCAL_AMFLAGS		= -I m4
diff --git a/include/qb/qblog.h b/include/qb/qblog.h
index 5ba0e18e3..4313d73fc 100644
--- a/include/qb/qblog.h
+++ b/include/qb/qblog.h
@@ -132,9 +132,14 @@ extern "C" {
  *			  QB_LOG_FILTER_FORMAT, "ringbuffer", LOG_TRACE);
  * @endcode
  *
- * @par Threaded logging.
- * To achieve non-blocking logging you can use threaded logging. So any
- * calls to write() or syslog() will not hold up your program.
+ * @par Thread safe non-blocking logging.
+ * Logging is only thread safe when threaded logging is in use. If you plan
+ * on logging from multiple threads, you must initialize libqb's logger thread
+ * and use qg_log_filter_ctl to set the QB_LOG_CONF_THREADED flag on all the
+ * logging targets in use.
+ *
+ * To achieve non-blocking logging you can use threaded logging as well
+ * So any calls to write() or syslog() will not hold up your program.
  *
  * Threaded logging use:
  * @code
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5bcdc22f5..a3ac7a6ae 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -42,7 +42,7 @@ source_to_lint		= util.c hdb.c ringbuffer.c ringbuffer_helper.c \
 libqb_la_SOURCES	= $(source_to_lint) unix.c
 libqb_la_LIBADD	        = @LTLIBOBJS@
 
-LDFLAGS 	= $(LDFLAGS_COPY:-Bsymbolic-functions=)
+AM_LDFLAGS 	= $(LDFLAGS_COPY:-Bsymbolic-functions=)
 
 if HAVE_SEM_TIMEDWAIT
 else