diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 07153ec0e8..227dd93f12 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -398,20 +398,19 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
 	    AC_LANG_PUSH(C++)
 	    save_LIBS=$LIBS
 
-	    dnl FIXME: Rewrite test to use regex, we do not use signals anymore.
 	    AC_MSG_CHECKING([for multithreaded boost libraries])
-	    LIBS="$save_LIBS -lboost_signals-mt $LIBTHREAD"
+	    LIBS="$save_LIBS -lboost_regex-mt $LIBTHREAD"
 	    AC_LINK_IFELSE(
-		[AC_LANG_PROGRAM([#include <boost/signal.hpp>],
-			[boost::signal<void ()> s;])],
+		[AC_LANG_PROGRAM([#include <boost/regex.hpp>],
+			[boost::regex reg;])],
 		[AC_MSG_RESULT([yes])
 		 BOOST_MT="-mt"],
 		[AC_MSG_RESULT([no])
 		 AC_MSG_CHECKING([for plain boost libraries])
-		 LIBS="$save_LIBS -lboost_signals"
+		 LIBS="$save_LIBS -lboost_regex"
 		 AC_LINK_IFELSE(
-		     [AC_LANG_PROGRAM([#include <boost/signal.hpp>],
-			     [boost::signal<void ()> s;])],
+		     [AC_LANG_PROGRAM([#include <boost/regex.hpp>],
+			     [boost::regex reg;])],
 		     [AC_MSG_RESULT([yes])
 		      BOOST_MT=""],
 		     [AC_MSG_RESULT([no])