diff --git a/Makefile.in b/Makefile.in
index 9d26819..cfe7b98 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -73,7 +73,8 @@ all: \
 	locale/$(PACKAGE_TARNAME).pot
 
 Release: \
-	application
+	application \
+	$(BINRLS)/libpw3270cpp.a
 
 application: \
 	$(foreach MODULE, $(MODULES), $(BINRLS)/@DLLPREFIX@$(MODULE)@DLLEXT@) \
@@ -194,7 +195,8 @@ $(POTDIR)/%.pot: \
 #---[ Debug Targets ]--------------------------------------------------------------------
 
 Debug: \
-	$(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
+	$(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \
+	$(BINDBG)/libpw3270cpp.a
 
 publish-debug: \
 	$(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
diff --git a/configure.ac b/configure.ac
index c093f74..3532559 100644
--- a/configure.ac
+++ b/configure.ac
@@ -381,6 +381,22 @@ if test "$app_cv_pic" == "yes"; then
 fi
 
 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)
+
+PKG_CHECK_MODULES( [GDBUS], [dbus-glib-1], app_cv_dbus=yes, AC_MSG_NOTICE([No GDBUS support.])  )
+AC_SUBST(GDBUS_LIBS)
+AC_SUBST(GDBUS_CFLAGS)
+
+if test "$app_cv_dbus" == "yes"; then
+        AC_DEFINE(HAVE_DBUS)
+fi
+
+dnl ---------------------------------------------------------------------------
 dnl Lib3270 flags
 dnl ---------------------------------------------------------------------------
 
diff --git a/src/libpw3270cpp/remote.cc b/src/libpw3270cpp/remote.cc
index 7153949..52e2a4a 100644
--- a/src/libpw3270cpp/remote.cc
+++ b/src/libpw3270cpp/remote.cc
@@ -36,7 +36,6 @@
 	#include <string.h>
 	#include <malloc.h>
 	#include <sys/types.h>
-	#include <unistd.h>
 	#include <limits.h>
 
 	#ifndef DBUS_TIMEOUT_INFINITE
@@ -50,6 +49,8 @@
 	#include <pw3270/ipcpackets.h>
 	#include <process.h>
  #else
+	#include <unistd.h>
+
 	#define HLLAPI_PACKET_IS_CONNECTED			"isConnected"
 	#define HLLAPI_PACKET_GET_CSTATE			"getConnectionState"
 	#define HLLAPI_PACKET_GET_PROGRAM_MESSAGE	"getProgramMessage"
--
libgit2 0.21.2