diff --git a/build_num b/build_num
index a0c2a7904..2f26a74f0 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 1577
+#define BUILD_NUM 1578
diff --git a/config_tests/qtdbus_test.cpp b/config_tests/qtdbus_test.cpp
new file mode 100644
index 000000000..9967fdf06
--- /dev/null
+++ b/config_tests/qtdbus_test.cpp
@@ -0,0 +1,10 @@
+
+#include <QApplication>
+#include <QtDBus/QtDBus>
+#include <QtDBus/QDBusConnection>
+
+main()
+{
+    QApplication app();
+    QDBusConnection conn = QDBusConnection::systemBus();
+}
diff --git a/configure.in b/configure.in
index 8132fe1a7..83fa45f88 100644
--- a/configure.in
+++ b/configure.in
@@ -270,12 +270,25 @@ AC_SUBST(HAVE_EXTERNAL_ANTLR)
 AC_SUBST(ANTLR_LIBS)
 AC_SUBST(ANTLR_INCLUDEPATH)
 
-# Need real test for this, but at least for now it seems Qt comes with
-# QtDBus support on all platforms except Windows
-AC_CHECK_HEADERS([QtDBus/QtDBus], [
+# TODO: Probably need to repackage this as Autoconf macro
+AC_MSG_CHECKING(QT DBus framework)
+( cd config_tests
+  cat <<EOF > test.pro
+  TEMPLATE = app
+  SOURCES = qtdbus_test.cpp
+  TARGET = qtdbus_test
+EOF
+  C=""
+  test -n "$QMAKESPEC" && C="$C -spec $QMAKESPEC "
+  $QMAKE $C test.pro
+  test -f Makefile || exit 1
+  make >/dev/null 2>&1 ) && {
+  AC_MSG_RESULT(ok)
   AC_DEFINE_UNQUOTED(HAVE_QTDBUS, 1, [qtdbus])
   AC_SUBST(HAVE_QTDBUS)
-])
+} || {
+  AC_MSG_RESULT(not available)
+}
 
 dnl ********************************************************************