diff --git a/configure.ac b/configure.ac
index 4c73dce..1b90597 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,6 +132,7 @@ case "$host" in
 		CFLAGS="$CFLAGS -mms-bitfields"
 		localedir="locale"
 		DLL_FLAGS="-shared -Wl,--add-stdcall-alias,--enable-stdcall-fixup"
+		DLLPREFIX=""
 
 		# http://stackoverflow.com/questions/18138635/mingw-exe-requires-a-few-gcc-dlls-regardless-of-the-code
 		SYSDLL_FLAGS="-shared -static-libgcc -static-libstdc++ -Wl,--add-stdcall-alias,--enable-stdcall-fixup"
@@ -159,6 +160,7 @@ case "$host" in
 		LDSOFLAGS="-Wl,-install_name,\`basename \$@\`"
 		LDARCH="-arch $build_cpu"
 		LDAPPFLAGS=""
+		DLLPREFIX="lib"
 		;;
 
 	*)
@@ -171,6 +173,7 @@ case "$host" in
 		DBGRPATH="-Wl,--rpath,.bin/Debug/lib"
 		DBGCMDPREFIX="LD_LIBRARY_PATH=\$(BINDIR)/Debug/lib"
 		JNI_CPPFLAGS="-I\$(JDK_HOME)/include -I\$(JDK_HOME)/include/linux"
+		DLLPREFIX="lib"
 
 esac
 
@@ -627,6 +630,7 @@ AC_SUBST(DLL_FLAGS)
 AC_SUBST(SYSDLL_FLAGS)
 AC_SUBST(DLL_CFLAGS)
 AC_SUBST(DLLDIR)
+AC_SUBST(DLLPREFIX)
 AC_SUBST(LDSOFLAGS)
 AC_SUBST(LDAPPFLAGS)
 AC_SUBST(LDLIBFLAGS)
diff --git a/src/java/Makefile.in b/src/java/Makefile.in
index 5887818..2f7e06c 100644
--- a/src/java/Makefile.in
+++ b/src/java/Makefile.in
@@ -74,12 +74,12 @@ CXXFLAGS=@CXXFLAGS@ @DLL_CFLAGS@ @JNI_CPPFLAGS@ -I../include
 
 #---[ Rules ]------------------------------------------------------------------
 
-$(OBJDBG)/%.o: %.cc Makefile *.h
+$(OBJDBG)/%.o: %.cc Makefile private.h jni3270.h
 	@echo "  CC   `basename $@`"
 	@mkdir -p `dirname $@`
 	$(CXX) -DDEBUG=1 $(CXXFLAGS) -o $@ -c $<
 
-$(OBJRLS)/%.o: %.cc Makefile *.h
+$(OBJRLS)/%.o: %.cc Makefile private.h jni3270.h
 	@echo "  CC   `basename $@`"
 	@mkdir -p `dirname $@`
 	@$(CXX) -DNDEBUG=1 $(CXXFLAGS) -o $@ -c $<
@@ -96,11 +96,11 @@ $(BINDIR)/java/$(PACKAGE_NAME)/%.class: %.java
 
 #---[ Release targets ]--------------------------------------------------------
 
-all: $(BINRLS)/jni3270@DLLEXT@
+all: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@
 
-Release: $(BINRLS)/jni3270@DLLEXT@
+Release: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@
 
-$(BINRLS)/jni3270@DLLEXT@:	$(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) \
+$(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@:	$(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) \
 				$(CLASS_RELEASE_OBJECTS)
 	@echo "  LD   `basename $@`"
 	@$(MKDIR) `dirname $@`
@@ -109,16 +109,17 @@ $(BINRLS)/jni3270@DLLEXT@:	$(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SR
 
 #---[ Debug targets ]----------------------------------------------------------
 
-Debug: $(BINDBG)/jni3270@DLLEXT@
+Debug: $(BINDBG)/@DLLPREFIX@jni3270@DLLEXT@ $(BINDIR)/java/testprogram.class
 
-$(BINDBG)/jni3270@DLLEXT@:	$(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) \
+$(BINDBG)/@DLLPREFIX@jni3270@DLLEXT@:	$(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) \
 				$(CLASS_DEBUG_OBJECTS)
 	@echo "  LD   `basename $@`"
 	@$(MKDIR) `dirname $@`
 	@$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ $(CLASS_LIBS)
 
 
-run: $(BINDBG)/jni3270@DLLEXT@
+run: $(BINDBG)/@DLLPREFIX@jni3270@DLLEXT@ $(BINDIR)/java/testprogram.class
+	java -Djava.library.path=$(BINDBG) -cp .bin/java/ testprogram
 
 #---[ Misc targets ]-----------------------------------------------------------
 
@@ -128,7 +129,7 @@ jni3270.h: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
 	$(JAVAH) -o $@ -classpath $(BINDIR)/java $(PACKAGE_NAME).terminal
 
 
-install: $(BINRLS)/jni3270@DLLEXT@
+install: $(BINRLS)/@DLLPREFIX@jni3270@DLLEXT@
 
 cleanDebug: clean
 
diff --git a/src/java/jni3270.cbp b/src/java/jni3270.cbp
index 1e76bff..69efe3e 100644
--- a/src/java/jni3270.cbp
+++ b/src/java/jni3270.cbp
@@ -8,19 +8,25 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="jni3270" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output=".bin/Debug/jni3270" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".obj/Debug/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option parameters="-Djava.library.path=.bin/Debug -cp .bin/java/ testprogram " />
+				<Option host_application="java" />
+				<Option run_host_application_in_terminal="1" />
 				<Compiler>
 					<Add option="-g" />
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output=".bin/Release/jni3270" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="0" extension_auto="1" />
+				<Option output=".bin/Release/jni3270" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".obj/Release/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option parameters="-Djava.library.path=.bin/Release -cp .bin/java/ testprogram" />
+				<Option host_application="java" />
+				<Option run_host_application_in_terminal="1" />
 				<Compiler>
 					<Add option="-O2" />
 				</Compiler>
diff --git a/src/java/terminal.java b/src/java/terminal.java
index 9b71ac7..1b0d119 100644
--- a/src/java/terminal.java
+++ b/src/java/terminal.java
@@ -53,7 +53,7 @@ public class terminal
 
 	static
 	{
-		System.loadLibrary("pw3270_jni");
+		System.loadLibrary("jni3270");
 	}
 
 };
--
libgit2 0.21.2