diff --git a/Makefile.in b/Makefile.in
index 3e56718..277410a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,6 +43,9 @@ javadocdir=@javadocdir@
 
 #---[ Configuration values ]-------------------------------------------------------------
 
+PACKAGE_NAME=pw3270
+PACKAGE_TARNAME=pw3270-java
+
 BASEDIR=@BASEDIR@
 SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 
@@ -111,14 +114,15 @@ install-doc: \
 	doc
 
 	@$(MKDIR) $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME)
-	@cp -r javadoc/* $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME)
+	@cp -rv ./doc/* $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME)
 	@find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type f -exec chmod 644 {} \;
 	@find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type d -exec chmod 755 {} \;
 
 
 Release: \
 	$(BINRLS)/$(LIBNAME) \
-	$(BINRLS)/$(PLUGIN)
+	$(BINRLS)/$(PLUGIN) \
+	doc
 
 doc: src/terminal.java
 	@$(JAVADOC) -encoding utf-8 -d $@ $^
diff --git a/src/jni/Makefile.in b/src/jni/Makefile.in
index 1675eba..4ec21bd 100644
--- a/src/jni/Makefile.in
+++ b/src/jni/Makefile.in
@@ -80,6 +80,7 @@ CXX=@CXX@
 LD=@CXX@
 JAVAH=@JAVAH@
 JAVAC=@JAVAC@
+JAR=@JAR@
 
 LIBS=-lpw3270cpp @LIBS@ @LIBICONV@
 CXXFLAGS=@CXXFLAGS@ -I../include
@@ -119,6 +120,13 @@ $(BINDIR)/java/pw3270/%.class: \
 	@$(JAVAC) -encoding utf-8 -d $(BINDIR)/java $^
 
 
+$(BINRLS)/pw3270.jar: \
+	$(BINDIR)/java/pw3270/terminal.class
+
+	@echo $@ ...
+	@mkdir -p `dirname $@`
+	@$(JAR) -cvf "$@" -C "$(BINDIR)/java" "pw3270"
+
 jni3270.h: \
 	$(BINDIR)/java/pw3270/terminal.class
 
@@ -151,10 +159,15 @@ $(BINDBG)/$(LIBNAME): \
 	@$(LD) -shared -Wl,-soname,$(notdir $@) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 install: \
-	$(BINRLS)$(LIBNAME)
+	$(BINRLS)/$(LIBNAME) \
+	$(BINRLS)/pw3270.jar
+
 
 	@$(MKDIR) $(DESTDIR)/$(jnidir)
-	@$(INSTALL_PROGRAM) $(BINRLS)$(LIBNAME) $(DESTDIR)/$(jnidir)
+	@$(INSTALL_PROGRAM) $(BINRLS)/$(LIBNAME) $(DESTDIR)/$(jnidir)
+
+	@$(MKDIR) $(DESTDIR)/$(jvmjardir)
+	@$(INSTALL_DATA) $(BINRLS)/pw3270.jar $(DESTDIR)/$(jvmjardir)
 
 clean:
 
diff --git a/src/plugin/Makefile.in b/src/plugin/Makefile.in
index 737cb75..673230d 100644
--- a/src/plugin/Makefile.in
+++ b/src/plugin/Makefile.in
@@ -112,6 +112,9 @@ Release: \
 install: \
 	$(BINRLS)/$(LIBNAME)
 
+	@$(MKDIR) $(DESTDIR)/$(libdir)/pw3270-plugins
+	@$(INSTALL_PROGRAM) $(BINRLS)/$(LIBNAME) $(DESTDIR)/$(libdir)/pw3270-plugins
+
 $(BINRLS)/$(LIBNAME): \
 	$(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
 
--
libgit2 0.21.2