diff --git a/Makefile.in b/Makefile.in
index d7dfee8..69d8fe5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -315,6 +315,7 @@ clean:
 	@make -C src/tools clean
 	@make -C src/plugins/remotectl clean
 	@make -C src/plugins/rx3270 clean
+	@make -C src/plugins/dbus3270 clean
 	@rm -f $(PACKAGE_NAME).png
 	@rm -f $(PACKAGE_NAME)-logo.png
 	@rm -f *.log
@@ -353,3 +354,8 @@ $(BINDIR)/Debug/plugins/rx3270@DLLEXT@: src/plugins/rx3270/* $(BINDIR)/Debug/$(P
 $(BINDIR)/Release/plugins/rx3270@DLLEXT@: src/plugins/rx3270/* $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
 	@make BINDIR="../../../$(BINDIR)" LIB3270_MODE=Release -C $(dir $<) Release
 
+$(BINDIR)/Debug/plugins/dbus3270@DLLEXT@: src/plugins/dbus3270/* $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
+	@make BINDIR="../../../$(BINDIR)" LIB3270_MODE=Debug -C $(dir $<) Debug
+
+$(BINDIR)/Release/plugins/dbus3270@DLLEXT@: src/plugins/dbus3270/* $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
+	@make BINDIR="../../../$(BINDIR)" LIB3270_MODE=Release -C $(dir $<) Release
diff --git a/pw3270.cbp b/pw3270.cbp
index 45c532d..2e97991 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -220,7 +220,6 @@
 		<Unit filename="src/lib3270/winversc.h" />
 		<Unit filename="src/lib3270/xioc.h" />
 		<Unit filename="src/lib3270/xl.h" />
-		<Unit filename="src/plugins/dbus/Makefile.in" />
 		<Unit filename="src/plugins/dbus/daemon.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -230,9 +229,29 @@
 		<Unit filename="src/plugins/dbus/main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/plugins/dbus/pw3270dbus.xml" />
 		<Unit filename="src/plugins/dbus/service.h" />
-		<Unit filename="src/plugins/dbus/test.sh" />
+		<Unit filename="src/plugins/dbus3270/Makefile.in" />
+		<Unit filename="src/plugins/dbus3270/daemon.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="src/plugins/dbus3270/daemon.h" />
+		<Unit filename="src/plugins/dbus3270/dbus-glue.h" />
+		<Unit filename="src/plugins/dbus3270/globals.h" />
+		<Unit filename="src/plugins/dbus3270/gobject.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="src/plugins/dbus3270/iocallback.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="src/plugins/dbus3270/main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="src/plugins/dbus3270/misc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="src/plugins/dbus3270/pw3270dbus.xml" />
+		<Unit filename="src/plugins/dbus3270/service.h" />
+		<Unit filename="src/plugins/dbus3270/test.sh" />
 		<Unit filename="src/plugins/remotectl/Makefile.in" />
 		<Unit filename="src/plugins/remotectl/hllapi.c">
 			<Option compilerVar="CC" />
diff --git a/src/plugins/dbus3270/Makefile.in b/src/plugins/dbus3270/Makefile.in
index 1250058..47388c1 100644
--- a/src/plugins/dbus3270/Makefile.in
+++ b/src/plugins/dbus3270/Makefile.in
@@ -54,20 +54,42 @@ DBUSBINDINGTOOL=@DBUSBINDINGTOOL@
 
 #---[ Flags ]------------------------------------------------------------------
 
+LIB3270_MODE ?= Default
+
 DLL_FLAGS=-shared
 DLL_CFLAGS=@DLL_CFLAGS@
 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall
 
-LIB3270_CFLAGS ?= `pkg-config --cflags lib3270`
 DBUS_CFLAGS=@DBUS_CFLAGS@
 GLIB_CFLAGS=@GLIB_CFLAGS@
 GTK_CFLAGS=@GTK_CFLAGS@
 
-LIB3270_LIBS ?= `pkg-config --libs lib3270`
 DBUS_LIBS=@DBUS_LIBS@
 GLIB_LIBS=@GLIB_LIBS@
 GTK_LIBS=@GTK_LIBS@
 
+ifeq ($(LIB3270_MODE),Debug)
+	PW3270_LIBS=-L$(BINDBG)@DLLDIR@ -lpw3270
+	PW3270_CFLAGS=-I../../../src/include
+	LIB3270_LIBS=-L$(BINDBG)@DLLDIR@ -l3270
+	LIB270_CFLAGS=-I../../../src/include
+endif
+
+ifeq ($(LIB3270_MODE),Release)
+	PW3270_LIBS=-L$(BINRLS)@DLLDIR@ -lṕw3270
+	PW3270_CFLAGS=-I../../../src/include
+	LIB3270_LIBS=-L$(BINRLS)@DLLDIR@ -l3270
+	LIB270_CFLAGS=-I../../../src/include
+endif
+
+ifeq ($(LIB3270_MODE),Default)
+	LIB3270_LIBS ?= `pkg-config --libs lib3270`
+	LIB3270_CFLAGS ?= `pkg-config --cflags lib3270`
+	PW3270_LIBS ?= `pkg-config --libs pw3270`
+	PW3270_CFLAGS ?= `pkg-config --cflags pw3270`
+endif
+
+
 #---[ Rules ]------------------------------------------------------------------
 
 $(OBJDBG)/%.o: %.c $(DEPENDS)
--
libgit2 0.21.2