diff --git a/configure.ac b/configure.ac
index 06144ad..303fb6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -420,7 +420,7 @@ fi
 # Java link options depends on OS
 case "$host" in
 	*-mingw32)
-		jvm_libs="-L\$(JVMDIR) -Wl,-rpath,\$(JVMDIR) -ljvm"
+		jvm_libs="-L\"\$(JRE_HOME)/bin/client\" -ljvm"
 		;;
 
 	*-apple-*)
@@ -724,6 +724,7 @@ if test "$app_cv_registry" == "yes"; then
 	AC_DEFINE(HAVE_WIN_REGISTRY)
 fi
 
+AC_SUBST()
 AC_SUBST(MAJOR_VERSION,"$(echo $VERSION | cut -d. -f1)")
 AC_SUBST(HOST_CC)
 AC_SUBST(EXEEXT)
diff --git a/src/classlib/Makefile.in b/src/classlib/Makefile.in
index 63904a7..b062bd9 100644
--- a/src/classlib/Makefile.in
+++ b/src/classlib/Makefile.in
@@ -127,4 +127,4 @@ clean:
 	@rm -fr $(OBJDIR)
 	@rm -fr $(BINDIR)
 	@rm -f testprogram
-	@find . -name "*~" -exec rm -f {} \;
+
diff --git a/src/include/plugin.mak.in b/src/include/plugin.mak.in
index 182d9fb..e59f34e 100644
--- a/src/include/plugin.mak.in
+++ b/src/include/plugin.mak.in
@@ -140,4 +140,4 @@ clean:
 	@rm -fr $(OBJDIR)
 	@rm -fr $(BINDIR)
 	@rm -f testprogram@EXEEXT@
-	@find . -name "*~" -exec rm -f {} \;
+
diff --git a/src/java/Makefile.in b/src/java/Makefile.in
index 52e5d70..4d37b70 100644
--- a/src/java/Makefile.in
+++ b/src/java/Makefile.in
@@ -80,13 +80,13 @@ include $(CLASSLIBDIR)/class.mak
 
 CXXFLAGS=@CFLAGS@ @CXXFLAGS@ @DLL_CFLAGS@ @JNI_CPPFLAGS@ -I../include
 
-PW3270_LIBS		?= -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270
+# PW3270_LIBS		?= -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270
 PW3270_CFLAGS	?= -I../include
 
 PLUGIN_CFLAGS=@CXXFLAGS@ @DLL_CFLAGS@ @JNI_CPPFLAGS@ -DJNIDIR="\"$(jnidir)\"" \
 				-DJARDIR="\"$(jvmjardir)\"" @GTK_CFLAGS@ @GTKMAC_CFLAGS@ $(PW3270_CFLAGS)
 
-PLUGIN_LIBS=@GTK_LIBS@ @GTKMAC_LIBS@ $(PW3270_LIBS) @JVM_LIBS@
+PLUGIN_LIBS=@GTK_LIBS@ @GTKMAC_LIBS@ @JVM_LIBS@
 
 #---[ Rules ]------------------------------------------------------------------
 
@@ -197,7 +197,12 @@ $(BINRLS)/plugins/j3270@DLLEXT@: \
 
 	@echo "  LD   `basename $@`"
 	@$(MKDIR) `dirname $@`
-	@$(CXX) @SYSDLL_FLAGS@ -Wl,--rpath,$(jnidir) $(LDFLAGS) -Wl,-soname,`basename $@` -o $@ $^ $(CLASS_LIBS) $(PLUGIN_LIBS) -L$(BINRLS)@DLLDIR@ -ljni3270
+	@$(CXX) @SYSDLL_FLAGS@ \
+	-Wl,--rpath,$(jnidir) $(LDFLAGS) -Wl,-soname,`basename $@` \
+	-o $@ $^ \
+	$(CLASS_LIBS) \
+	$(PLUGIN_LIBS) \
+	-L../../.bin/Release@DLLDIR@ -l3270 -lpw3270 \
 
 #---[ Debug targets ]----------------------------------------------------------
 
@@ -219,7 +224,14 @@ $(BINDBG)/plugins/j3270@DLLEXT@: \
 
 	@echo "  LD   `basename $@`"
 	@$(MKDIR) `dirname $@`
-	@$(CXX) @SYSDLL_FLAGS@ -Wl,--rpath,.bin/Debug@DLLDIR@ $(LDFLAGS) -Wl,-soname,`basename $@` -o $@ $^ $(CLASS_LIBS) $(PLUGIN_LIBS) -L$(BINDBG)@DLLDIR@ -ljni3270
+
+	@$(CXX) @SYSDLL_FLAGS@ \
+	-Wl,--rpath,.bin/Debug@DLLDIR@ $(LDFLAGS) -Wl,-soname,`basename $@` \
+	-o $@ $^ \
+	$(CLASS_LIBS) \
+	$(PLUGIN_LIBS) \
+	-L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270 \
+	-L$(BINDBG)@DLLDIR@ -ljni3270
 
 run: $(BINDBG)@DLLDIR@/@DLLPREFIX@jni3270@DLLEXT@ $(BINDIR)/java/testprogram.class
 	@LD_LIBRARY_PATH=../../.bin/Debug@DLLDIR@/ java -Djava.library.path=$(BINDBG)@DLLDIR@ -cp .bin/java/ testprogram
diff --git a/src/java/plugin.cc b/src/java/plugin.cc
index 7e1ce7d..0b8de4a 100644
--- a/src/java/plugin.cc
+++ b/src/java/plugin.cc
@@ -415,10 +415,9 @@ extern "C" {
 	g_mkdir_with_parents(exports,0777);
 
 	lib3270_trace_event(v3270_get_session(widget),"java.class.path=%s;%s",dirname,exports);
-	lib3270_trace_event(v3270_get_session(widget),"java.library.path=%s",myDIR);
+	lib3270_trace_event(v3270_get_session(widget),"java.library.path=%s",myDir);
 
-
-	options[vm_args.nOptions++].optionString = g_strdup_printf("-Djava.library.path=%s",myDIR);
+	options[vm_args.nOptions++].optionString = g_strdup_printf("-Djava.library.path=%s",myDir);
 	options[vm_args.nOptions++].optionString = g_strdup_printf("-Djava.class.path=%s;%s",dirname,exports);
 
 	g_free(myDir);
diff --git a/src/plugins/dbus3270/Makefile.in b/src/plugins/dbus3270/Makefile.in
index 784115a..78c956e 100644
--- a/src/plugins/dbus3270/Makefile.in
+++ b/src/plugins/dbus3270/Makefile.in
@@ -162,4 +162,4 @@ clean:
 	@rm -fr $(BINDIR)
 	@rm -fr .tmp
 	@rm -f dbus-glue.h
-	@find . -name "*~" -exec rm -f {} \;
+
--
libgit2 0.21.2