diff --git a/configure.ac b/configure.ac
index e0ea9aa..fc721c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,11 +207,17 @@ AC_CONFIG_FILES(src/plugins/hllapi/Makefile)
 
 #--[ lib3270 defines ]----------------------------------------------------------------------------------------------------------------------------------------
 
-LIB3270_CFLAGS=-I$ac_pwd/src/include
-PW3270_CFLAGS=-I$ac_pwd/src/pw3270/include
+LIB3270_CFLAGS="-I$ac_pwd/src/include"
+LIB3270_LIBS="-L$ac_pwd/.bin/Debug$DLLDIR -l3270"
+
+PW3270_CFLAGS="-I$ac_pwd/src/pw3270/include -I$ac_pwd/src/include"
+PW3270_LIBS="-L$ac_pwd/.bin/Debug$DLLDIR -lpw3270"
 
 AC_SUBST(LIB3270_CFLAGS)
+AC_SUBST(LIB3270_LIBS)
+
 AC_SUBST(PW3270_CFLAGS)
+AC_SUBST(PW3270_LIBS)
 
 #--[ Check gettext ]------------------------------------------------------------------------------------------------------------------------------------------
 
diff --git a/src/java/Makefile.in b/src/java/Makefile.in
index df05925..aab7507 100644
--- a/src/java/Makefile.in
+++ b/src/java/Makefile.in
@@ -77,14 +77,17 @@ include $(CLASSLIBDIR)/class.mak
 
 #---[ Build options ]----------------------------------------------------------
 
-CXXFLAGS=@CFLAGS@ @CXXFLAGS@ @DLL_CFLAGS@ @JNI_CPPFLAGS@ -I../include
-
-PW3270_LIBS	?= -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270
+LIB3270_LIBS=@LIB3270_LIBS@
+PW3270_LIBS=@PW3270_LIBS@
 
 PLUGIN_CFLAGS=@CXXFLAGS@ -DPW3270_PLUGIN -Wno-deprecated-declarations @DLL_CFLAGS@ @JNI_CPPFLAGS@ -DJNIDIR="\"$(jnidir)\"" \
-				-DJARDIR="\"$(jvmjardir)\"" @GTK_CFLAGS@ @GTKMAC_CFLAGS@ @PW3270_CFLAGS@ @LIB3270_CFLAGS@
+				-DJARDIR="\"$(jvmjardir)\"" @GTK_CFLAGS@ @GTKMAC_CFLAGS@ \
+				@PW3270_CFLAGS@ @LIB3270_CFLAGS@
+
+CXXFLAGS=@CFLAGS@ @CXXFLAGS@ @DLL_CFLAGS@ @JNI_CPPFLAGS@ @PW3270_CFLAGS@
+
 
-PLUGIN_LIBS=@GTK_LIBS@ @GTKMAC_LIBS@ @INTL_LIBS@ @JVM_LIBS@
+PLUGIN_LIBS=@GTK_LIBS@ @GTKMAC_LIBS@ @INTL_LIBS@ @JVM_LIBS@ @PW3270_LIBS@ @LIB3270_LIBS@
 
 #---[ Rules ]------------------------------------------------------------------
 
@@ -231,7 +234,6 @@ $(BINRLS)/plugins/j3270@DLLEXT@: \
 		-o $@ $^ \
 		$(CLASS_LIBS) \
 		$(PLUGIN_LIBS) \
-		-L../../.bin/Release@DLLDIR@ -l3270 -lpw3270\
 		-L$(BINRLS)@DLLDIR@ -ljni3270
 
 ../../.bin/Release@DLLDIR@/lib3270@DLLEXT@:
@@ -264,7 +266,6 @@ $(BINDBG)/plugins/j3270@DLLEXT@: \
 	-o $@ $^ \
 	$(CLASS_LIBS) \
 	$(PLUGIN_LIBS) \
-	-L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270 \
 	-L$(BINDBG)@DLLDIR@ -ljni3270
 
 run: \
--
libgit2 0.21.2