diff --git a/v2/test/qt5/jamroot.jam b/v2/test/qt5/jamroot.jam
index 2d98c9136..b9585e3ef 100644
--- a/v2/test/qt5/jamroot.jam
+++ b/v2/test/qt5/jamroot.jam
@@ -36,13 +36,14 @@ if [ qt5.initialized ]
       [ link qtwidgets.cpp /qt5//QtWidgets ]
 
       # Multimedia toolkits.
+      [ link qtwebkit.cpp /qt5//QtWebKit ]
       [ link qtwebkitwidgets.cpp /qt5//QtWebKitWidgets ]
       [ link qtmultimedia.cpp /qt5//QtMultimedia ]
 
       # QtQuick version1
       [ link qtdeclarative.cpp /qt5//QtDeclarative ]
 
-      # QtQuick version2 
+      # QtQuick version2
       [ run qtquick.cpp /qt5//QtQuick : : $(CWD)/qtquick.qml ]
 
       # Help systems.
@@ -50,7 +51,7 @@ if [ qt5.initialized ]
 
       # Testing using QtTest. Simple sample
       # ToDo: better support for "automoc" aka '#include "qttest.moc"'
-      [ run qttest.cpp [ cast _ moccable-cpp : qttest.cpp ] /qt5//QtTest : : : <define>TEST_MOCK ]
+      [ run qttest.cpp [ cast _ moccable5-cpp : qttest.cpp ] /qt5//QtTest : : : <define>TEST_MOCK ]
 
       # Test moc rule
       [ run mock.cpp mock.h /qt5//QtCore : : : <define>TEST_MOCK ]
diff --git a/v2/test/qt5/qtwebkit.cpp b/v2/test/qt5/qtwebkit.cpp
new file mode 100644
index 000000000..aa6fdc92f
--- /dev/null
+++ b/v2/test/qt5/qtwebkit.cpp
@@ -0,0 +1,22 @@
+// (c) Copyright Juergen Hunold 2012
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#define BOOST_TEST_MODULE QtWebKit
+
+#include <QWebSettings>
+
+#include <boost/test/unit_test.hpp>
+
+BOOST_AUTO_TEST_CASE( defines)
+{
+    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_CORE_LIB), true);
+    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_GUI_LIB), true);
+    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_WEBKIT_LIB), true);
+}
+
+BOOST_AUTO_TEST_CASE( webkit )
+{
+    BOOST_CHECK(QWebSettings::globalSettings());
+}
diff --git a/v2/test/qt5/qtwebkitwidgets.cpp b/v2/test/qt5/qtwebkitwidgets.cpp
index d043ef525..52c05c9a9 100644
--- a/v2/test/qt5/qtwebkitwidgets.cpp
+++ b/v2/test/qt5/qtwebkitwidgets.cpp
@@ -3,7 +3,7 @@
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#define BOOST_TEST_MODULE QtWebKit
+#define BOOST_TEST_MODULE QtWebKitWidgets
 
 #include <QWebPage>
 
@@ -13,7 +13,7 @@ BOOST_AUTO_TEST_CASE( defines)
 {
     BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_CORE_LIB), true);
     BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_GUI_LIB), true);
-    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_WEBKIT_LIB), true);
+    BOOST_CHECK_EQUAL(BOOST_IS_DEFINED(QT_WEBKITWIDGETS_LIB), true);
 }
 
 BOOST_AUTO_TEST_CASE( webkit )
diff --git a/v2/tools/qt5.jam b/v2/tools/qt5.jam
index a4848c1f7..a5fdf717c 100644
--- a/v2/tools/qt5.jam
+++ b/v2/tools/qt5.jam
@@ -428,7 +428,8 @@ rule init ( prefix : version ? : condition * : namespace ? : infix ? : full_bin
     add-shared-library QtScriptTools : QtScript : QT_SCRIPTTOOLS_LIB : $(target-requirements) ;
 
     # WebKit
-    add-shared-library QtWebKitWidgets : QtGui : QT_WEBKIT_LIB : $(target-requirements) ;
+    add-shared-library QtWebKit        : QtGui : QT_WEBKIT_LIB : $(target-requirements) ;
+    add-shared-library QtWebKitWidgets : QtGui : QT_WEBKITWIDGETS_LIB : $(target-requirements) ;
 
     # Multimedia engine
     add-shared-library QtMultimedia : QtGui : QT_MULTIMEDIA_LIB : $(target-requirements) ;