diff --git a/configure.ac b/configure.ac
index c4b7bf405e9423dda9dfc2d73c890b72f4584ff6..a310a983c5d4c654cf13394e3461e5bf196dc587 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,6 +176,9 @@ AC_DEFINE(DEBUG, 1, [keep debugging on during beta testing])
 AC_DEFINE(VALGRIND, 1, [easier debugging using valgrind])
 #AC_DEFINE(WITH_AUTHENTICATION, 1, [support for authentication])
 
+# in the end will contain all the compiled MAPI function libraries
+MAPI_FUNC_LIBS="stdflib.so"
+
 # DiMAPI
 AC_MSG_CHECKING([if distributed monitoring (DiMAPI) is enabled])
 AC_ARG_ENABLE(dimapi,
@@ -203,8 +206,10 @@ AS_HELP_STRING([--enable-dag], [Enable support for Endace's DAG cards]),
 	*) AC_MSG_ERROR(bad value ${enableval} for --enable-dag) ;;
 esac], [dag=false])
 AM_CONDITIONAL(DRIVER_DAG, test x$dag = xtrue)
+AM_CONDITIONAL(BINARY_DAGFLIB, test x$dag = xtrue)
 if test x$dag = xtrue; then
 	MAPI_CONF_DAG_ENTRY=$srcdir/config/mapi.conf.dag.entry
+	MAPI_FUNC_LIBS="${MAPI_FUNC_LIBS}:dagflib.so"
 	AC_MSG_RESULT(yes)
 else
 	MAPI_CONF_DAG_ENTRY=/dev/null
@@ -215,9 +220,6 @@ AC_SUBST_FILE(MAPI_CONF_DAG_ENTRY)
 
 # optional MAPI function libraries
 
-# in the end will contain all the compiled MAPI function libraries
-MAPI_FUNC_LIBS="stdflib.so"
-
 # trackflib
 AC_MSG_CHECKING(if the traffic characterization library is enabled)
 AC_ARG_ENABLE(trackflib,
@@ -254,27 +256,6 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-# dagflib
-AC_MSG_CHECKING(if the DAG library is enabled)
-AC_ARG_ENABLE(dagflib,
-AS_HELP_STRING([--enable-dagflib], [Build the DAG function library]),
-[case "${enableval}" in
-	yes) dagflib=true ;;
-	no)  dagflib=false ;;
-	*) AC_MSG_ERROR(bad value ${enableval} for --enable-dagflib) ;;
-esac], [dagflib=false])
-if test x$dagflib = xtrue -a x$dag = xfalse; then
-	AC_MSG_RESULT(yes)
-	AC_MSG_ERROR(Please use --enable-dagflib only in conjunction with --enable-dag. You don't need to build dagflib if you are not going to use a DAG card.)
-fi
-AM_CONDITIONAL(BINARY_DAGFLIB, test x$dagflib = xtrue)
-if test x$dagflib = xtrue; then
-	MAPI_FUNC_LIBS="${MAPI_FUNC_LIBS}:dagflib.so"
-	AC_MSG_RESULT(yes)
-else
-	AC_MSG_RESULT(no)
-fi
-
 # ipfixflib
 AC_MSG_CHECKING(if the ipfix library is enabled)
 AC_ARG_ENABLE(ipfixflib,
@@ -398,7 +379,10 @@ AS_HELP_STRING([--with-libdag=DIR], [Manual libdag path configuration, in case t
 		;;
   esac ],
 [ if test x$dag = xtrue; then
-	if test -f ${prefix}/include/dagapi.h; then
+	if test -f ${prefix}/include/dagapi.h -a -f ${prefix}/lib/libdag.a; then
+		DAGINC="-I${prefix}/include"
+		DAGLIB="-L${prefix}/lib -ldag"
+	elif test -f /usr/local/include/dagapi.h -a -f /usr/local/lib/libdag.a; then
 		DAGINC="-I${prefix}/include"
 		DAGLIB="-L${prefix}/lib -ldag"
 	elif test -f /usr/include/dag/dagapi.h; then
@@ -570,3 +554,4 @@ fi
 if test x$dag = xtrue; then
 echo "option:                    support for DAG cards"
 fi
+
diff --git a/doc/mapitutor.pdf b/doc/mapitutor.pdf
index ad86af747517d9c0341bb9d27decb0ca4b3ab4b5..8cc81ca59b3a552b3dd193f10bc6949d87c0ce5a 100644
Binary files a/doc/mapitutor.pdf and b/doc/mapitutor.pdf differ
diff --git a/doc/mapitutor.tex b/doc/mapitutor.tex
index 6dc1d19f9444257f59a0516785bad076a78b64c4..d04eca147f780e41ca48bd45ae9395cb3839df75 100644
--- a/doc/mapitutor.tex
+++ b/doc/mapitutor.tex
@@ -350,7 +350,6 @@ Section~\ref{sec:dimapi}) \\
 \multicolumn{2}{l}{MAPI function libraries} \\
 {\tt --enable-trackflib} & Build the traffic characterization library \\
 {\tt --enable-anonflib} & Build the traffic anonymization library \\
-{\tt --enable-dagflib} & Build the DAG function library \\
 {\tt --enable-ipfixflib} & Build the NetFlow export library \\
 {\tt --enable-extraflib} & Build the Extra MAPI function library \\
 \multicolumn{2}{l}{Miscellaneous options} \\