diff --git a/config/ChangeLog b/config/ChangeLog
index 6cb244b8c8..6d5520fd2b 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,6 +1,7 @@
 2006-03-06  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
-	* qt.m4 (add QtCore include directory)
+	* qt.m4: add QtCore include directory
+	* qt.m4: search also for libQtCore4 etc.
 
 2006-03-06  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
diff --git a/config/qt.m4 b/config/qt.m4
index f9419ebf4b..525979dc84 100644
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -367,7 +367,14 @@ AC_DEFUN([QT4_CHECK_COMPILE],
 		AC_LANG_CPLUSPLUS
 		SAVE_CXXFLAGS=$CXXFLAGS
 		CXXFLAGS="$CXXFLAGS $QT4_INCLUDES $QT4_LDFLAGS"
-		QT4_TRY_LINK(-lQtCore)
+		for libname in '-lQtCore -lQtGui -lQtXml -lQt3Support' \
+		               '-lQtCore4 -lQtGui4 -lQtXml4 -lQt3Support4'
+		do
+			QT4_TRY_LINK($libname)
+			if test -n "$qt4_cv_libname"; then
+				break;
+			fi
+		done
 		CXXFLAGS=$SAVE_CXXFLAGS
 	])
 
@@ -377,7 +384,6 @@ AC_DEFUN([QT4_CHECK_COMPILE],
 			AC_MSG_ERROR([Cannot compile a simple Qt 4 executable. Check you have the right \$QT4DIR !])
 		fi
 	else
-		qt4_cv_libname="$qt4_cv_libname -lQtGui -lQt3Support"
 		AC_MSG_RESULT([$qt4_cv_libname])
 	fi
 ])