diff --git a/configure.ac b/configure.ac
index 9787bc28..207c0414 100755
--- a/configure.ac
+++ b/configure.ac
@@ -252,7 +252,8 @@ AC_ARG_ENABLE(connmarktos,
 if test x"$enable_connmarktos" = "xyes" ; then
 	AC_MSG_NOTICE([Linux Netfilter Conntrack support requested by --enable-connmarktos: ${enable_connmarktos}])
 	if test "x$enable_connmarktos" != "xno"; then
-	    AC_SEARCH_LIBS([nfct_query], [netfilter_conntrack],,[
+	    PKG_CHECK_MODULES([NETFILTER_CONNTRACK], [libnetfilter_conntrack],,
+	    [AC_SEARCH_LIBS([nfct_query], [netfilter_conntrack],,[
 	        if test x"$enable_connmarktos" = "xyes"; then
 	            AC_MSG_ERROR([--enable-connmarktos specified but libnetfilter-conntrack library not found])
 	        fi
@@ -262,7 +263,7 @@ if test x"$enable_connmarktos" = "xyes" ; then
 	        if test x"$enable_connmarktos" = "xyes"; then
 	            AC_MSG_ERROR([--enable-connmarktos specified but libnetfilter-conntrack headers not found])
 	        fi
-	        with_netfilter_conntrack=no])
+	        with_netfilter_conntrack=no])])
 	  # If nothing is broken; enable the libraries usage.
 	  if test "x$with_netfilter_conntrack" != "xno"; then
 		with_netfilter_conntrack=yes
diff --git a/src/Makefile.am b/src/Makefile.am
index c261ed0f..b81ced7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@ AM_CFLAGS += -I$(top_srcdir)/libcork/include
 endif
 AM_CFLAGS += $(LIBPCRE_CFLAGS)
 
-SS_COMMON_LIBS = $(INET_NTOP_LIB) $(LIBPCRE_LIBS)
+SS_COMMON_LIBS = $(INET_NTOP_LIB) $(LIBPCRE_LIBS) $(NETFILTER_CONNTRACK_LIBS)
 if !USE_SYSTEM_SHARED_LIB
 SS_COMMON_LIBS += $(top_builddir)/libbloom/libbloom.la \
                   $(top_builddir)/libipset/libipset.la \