diff --git a/configure.in b/configure.in
index c74b43ce78..82777730c5 100644
--- a/configure.in
+++ b/configure.in
@@ -412,6 +412,9 @@ case $host in
 ;;
 *)
     AC_CHECK_LIB(netfilter_queue, nfq_open,, NFQ="no",)
+    AC_CHECK_LIB([netfilter_queue], [nfq_set_queue_maxlen],AC_DEFINE_UNQUOTED([HAVE_NFQ_MAXLEN],[1],[Found queue max length support in netfilter_queue]) ,,[-lnfnetlink])
+
+
 ;;
 esac
 
diff --git a/src/source-nfq.c b/src/source-nfq.c
index a953ce8e7e..e652d0d008 100644
--- a/src/source-nfq.c
+++ b/src/source-nfq.c
@@ -292,8 +292,6 @@ TmEcode NFQInitThread(NFQThreadVars *nfq_t, uint32_t queue_maxlen)
         return TM_ECODE_FAILED;
     }
 
-    /* XXX detect this at configure time & make it an option */
-#define HAVE_NFQ_MAXLEN
 #ifdef HAVE_NFQ_MAXLEN
     if (queue_maxlen > 0) {
         SCLogInfo("setting queue length to %" PRId32 "", queue_maxlen);