diff --git a/Makefile.in b/Makefile.in
index 0d9c5ff..c73e918 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -68,8 +68,8 @@ CXX=@CXX@
 CC=@CC@
 LD=@CXX@
 
-LIBS=-lpw3270cpp @LIBS@ @LIBICONV@ `$(PHPCONFIG) --libs`
-CFLAGS=@CFLAGS@ `$(PHPCONFIG) --includes`
+LIBS=-lpw3270cpp @LIBS@ @LIBICONV@ @DBUS_LIBS@ `$(PHPCONFIG) --libs`
+CFLAGS=@CFLAGS@ @DBUS_CFLAGS@ `$(PHPCONFIG) --includes`
 LDFLAGS=@LDFLAGS@ 
 
 #---[ Rules ]----------------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index a69de96..0fbc223 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,6 +258,14 @@ AC_CHECK_HEADER(libintl.h, [
 ])
 
 dnl ---------------------------------------------------------------------------
+dnl Check for D-Bus
+dnl ---------------------------------------------------------------------------
+
+PKG_CHECK_MODULES( [DBUS], [dbus-1], app_cv_libdbus=yes, AC_MSG_NOTICE([ No DBUS support.]) )
+AC_SUBST(DBUS_LIBS)
+AC_SUBST(DBUS_CFLAGS)
+
+dnl ---------------------------------------------------------------------------
 dnl Check for C++ 2011 support
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([AX_CHECK_COMPILE_FLAG],
--
libgit2 0.21.2