diff --git a/Makefile.am b/Makefile.am
index 747a33b93..27b972d68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,8 @@ BUILT_SOURCES =
 EXTRA_DIST =
 SUBDIRS =
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/
+AM_CPPFLAGS = -I$(top_srcdir)/src/ \
+	$(NOBUGMT_LUMIERA_CFLAGS)
 
 # Only use subdirs if really needed, prefer the include scheme below
 #SUBDIRS +=
diff --git a/admin/Makefile.am b/admin/Makefile.am
index cf9083504..ab0be86fa 100644
--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -20,7 +20,7 @@ admin_srcdir = $(top_srcdir)/admin
 noinst_PROGRAMS += vgsuppression
 vgsuppression_SOURCES = $(admin_srcdir)/vgsuppression.c
 vgsuppression_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-vgsuppression_LDADD = liblumi.a -lnobugmt -lpthread -ldl
+vgsuppression_LDADD = liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl
 
 noinst_PROGRAMS += rsvg-convert
 rsvg_convert_SOURCES = $(admin_srcdir)/rsvg-convert.c
diff --git a/configure.ac b/configure.ac
index 42b6961dc..8c6e4300d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,15 +80,6 @@ AC_ARG_ENABLE(release, AC_HELP_STRING([--enable-release], [select NoBug RELEASE
 # C headers and libraries
 AC_LANG_PUSH([C])
 
-AC_CHECK_HEADER([nobug.h],
-        AC_DEFINE(HAVE_NOBUG_H),
-        AC_MSG_ERROR([NoBug header missing                      (http://www.pipapo.org/pipawiki/NoBug)])
-        )
-AC_CHECK_LIB([nobugmt],  nobug_thread_id_get,
-        ,
-        AC_MSG_ERROR([NoBug multithreading library missing      (http://www.pipapo.org/pipawiki/NoBug)])
-        )
-
 AC_CHECK_HEADER([execinfo.h], AC_DEFINE(HAVE_EXECINFO_H))
 # there is a warning in nobug, disabled til fixed AC_CHECK_HEADER([valgrind/valgrind.h], AC_DEFINE(HAVE_VALGRIND_VALGRIND_H))
 
@@ -168,6 +159,19 @@ AC_SUBST(GTK_LUMIERA_LIBS)
 
 # END Gtk Dependancies
 
+
+############## Nobug Dependancies
+PKG_CHECK_MODULES(NOBUG_LUMIERA, [nobug >= 0.3rc1],
+				 AC_DEFINE(HAVE_NOBUG_H),
+				 AC_MSG_ERROR([NoBug pkg-config metadata missing                      (http://www.pipapo.org/pipawiki/NoBug)])
+)
+PKG_CHECK_MODULES(NOBUGMT_LUMIERA, [nobugmt >= 0.3rc1],
+				 AC_DEFINE(HAVE_NOBUGMT_H),
+				 AC_MSG_ERROR([NoBug pkg-config metadata missing                      (http://www.pipapo.org/pipawiki/NoBug)])
+)
+
+# END Nobug Dependancies
+
 # Print a summary
 AC_MSG_RESULT([
 Configuration Summary:])
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 9fb72b7ff..a4d3df708 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -77,7 +77,7 @@ lumigui_SOURCES =												\
 	$(lumigui_srcdir)/output/xvdisplayer.hpp
 
 lumigui_LDFLAGS = 
-lumigui_LDADD = $(GTK_LUMIERA_LIBS) liblumicommon.a liblumi.a
+lumigui_LDADD = $(GTK_LUMIERA_LIBS) liblumicommon.a liblumi.a $(NOBUGMT_LUMIERA_LIBS)
 
 lumigui_DEPENDENCIES =											\
 	$(top_builddir)/lumiera_ui.rc								\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d9df41271..564c8a454 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,7 +21,7 @@ tests_srcdir = $(top_srcdir)/tests
 check_PROGRAMS += test-error
 test_error_SOURCES = $(tests_srcdir)/error/errortest.c
 test_error_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_error_LDADD = liblumi.a -lnobugmt -lpthread -ldl
+test_error_LDADD = liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl
 
 check_PROGRAMS += test-locking
 test_locking_SOURCES = \
@@ -29,36 +29,36 @@ test_locking_SOURCES = \
 	$(tests_srcdir)/locking/mutex.c \
 	$(tests_srcdir)/locking/condition.c
 test_locking_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_locking_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm
+test_locking_LDADD = liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
 
 check_PROGRAMS += test-llist
 test_llist_SOURCES = $(tests_srcdir)/library/test-llist.c
 test_llist_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_llist_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm
+test_llist_LDADD = liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
 
 check_PROGRAMS += test-safeclib
 test_safeclib_SOURCES = $(tests_srcdir)/library/test-safeclib.c
 test_safeclib_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_safeclib_LDADD = $(builddir)/liblumi.a -lnobugmt -lpthread -ldl -lm
+test_safeclib_LDADD = $(builddir)/liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
 
 check_PROGRAMS += test-uuid
 test_uuid_SOURCES = $(tests_srcdir)/library/test-uuid.c
 test_uuid_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_uuid_LDADD = $(builddir)/liblumi.a -lnobugmt -lpthread -ldl -lm
+test_uuid_LDADD = $(builddir)/liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
 
 check_PROGRAMS += test-references
 test_references_SOURCES = $(tests_srcdir)/library/test-references.c
 test_references_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_references_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm -lrt
+test_references_LDADD = liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm -lrt
 
 check_PROGRAMS += test-filedescriptors
 test_filedescriptors_SOURCES = $(tests_srcdir)/backend/test-filedescriptors.c
 test_filedescriptors_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_filedescriptors_LDADD = liblumibackend.a liblumi.a -lnobugmt -lpthread -ldl -lm
+test_filedescriptors_LDADD = liblumibackend.a liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
 
 check_PROGRAMS += test-filehandles
 test_filehandles_SOURCES = $(tests_srcdir)/backend/test-filehandles.c
 test_filehandles_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_filehandles_LDADD = liblumibackend.a liblumi.a -lnobugmt -lpthread -ldl -lm
+test_filehandles_LDADD = liblumibackend.a liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
 
 TESTS = $(tests_srcdir)/test.sh
diff --git a/tests/common/Makefile.am b/tests/common/Makefile.am
index a8e62a528..55393df9c 100644
--- a/tests/common/Makefile.am
+++ b/tests/common/Makefile.am
@@ -31,7 +31,7 @@ test_common_LDADD =								\
 	liblumi.a								\
 	liblumicommon.a								\
 	liblumibackend.a							\
-	-lnobugmt -lpthread -ldl -lboost_program_options-mt -lboost_regex-mt
+	$(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt
 
 test_common_SOURCES =						\
 	$(testcommon_srcdir)/appconfigtest.cpp			\
diff --git a/tests/components/Makefile.am b/tests/components/Makefile.am
index 771818c9e..733737580 100644
--- a/tests/components/Makefile.am
+++ b/tests/components/Makefile.am
@@ -31,7 +31,7 @@ test_components_LDADD =								\
 	liblumi.a								\
 	liblumicommon.a								\
 	liblumibackend.a							\
-	-lnobugmt -lpthread -ldl -lboost_program_options-mt -lboost_regex-mt
+	$(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt
 
 test_components_SOURCES =							\
 	$(testcomponents_srcdir)/backend/mediaaccessmock.cpp			\
diff --git a/tests/plugin/Makefile.am b/tests/plugin/Makefile.am
index f9fc1b5a2..c8cf9a22f 100644
--- a/tests/plugin/Makefile.am
+++ b/tests/plugin/Makefile.am
@@ -20,7 +20,7 @@ noinst_PROGRAMS += test-plugin
 
 test_plugin_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Werror
 test_plugin_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_plugin_LDADD = liblumi.a -lnobugmt -lpthread -ldl
+test_plugin_LDADD = liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl
 test_plugin_SOURCES = $(examples_srcdir)/plugin_main.c
 
 noinst_HEADERS += $(examples_srcdir)/hello_interface.h