diff --git a/Makefile.in b/Makefile.in
index 8972b2c..b2af6a0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -385,12 +385,6 @@ install-java:
 install-rexx:
 	@$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/rx3270 install
 
-#install-plugin-rexx:
-#	@$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/rx3270 install
-#
-#install-plugin-dbus:
-#	@$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/dbus3270 install
-
 clean:
 	@rm -fr .obj
 	@rm -fr .bin
diff --git a/configure.ac b/configure.ac
index 7a61c62..06144ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -316,7 +316,7 @@ AC_ARG_VAR([JDK_HOME], [JDK home directory])
 AC_ARG_VAR([JRE_HOME], [JRE home directory])
 
 AC_ARG_WITH([jnidir], [AS_HELP_STRING([--with-jnidir], [Directory for JNI libraries])], [ jnidir="$withval" ],[ jnidir=\$"{libdir}/java" ])
-AC_ARG_WITH([jnidir], [AS_HELP_STRING([--with-javadocdir], [Directory for javadoc files])], [ javadocdir="$withval" ],[ javadocdir=\$"{datadir}/javadoc" ])
+AC_ARG_WITH([javadocdir], [AS_HELP_STRING([--with-javadocdir], [Directory for javadoc files])], [ javadocdir="$withval" ],[ javadocdir=\$"{datadir}/javadoc" ])
 
 AC_ARG_WITH([jvmjardir], [AS_HELP_STRING([--with-jvmjardir], [Directory for JAR files])], [ jvmjardir="$withval" ],[ jvmjardir=\$"{libdir}/jvm-exports" ])
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 623df90..87489cb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-18 21:35-0300\n"
+"POT-Creation-Date: 2015-06-19 10:47-0300\n"
 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Portugues <>\n"
diff --git a/pw3270.spec.in b/pw3270.spec.in
index 5309ba8..ef7dde1 100644
--- a/pw3270.spec.in
+++ b/pw3270.spec.in
@@ -226,6 +226,16 @@ from pw3270 application.
 
 Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
 
+%package javadoc 
+Summary:        Javadoc for %{name} 
+Group:          Documentation 
+Requires:       jpackage-utils
+
+%description javadoc 
+API documentation for %{name}. 
+
+Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
+
 %endif
 
 
@@ -244,11 +254,19 @@ export FFLAGS="$RPM_OPT_FLAGS"
 %if 0%{?_office}
 export OFFICE_HOME=%{_libdir}/libreoffice
 export OO_SDK_HOME=%{_libdir}/libreoffice/sdk
-%configure --sysconfdir=%{_sysconfdir}
-%else
-%configure --disable-office --sysconfdir=%{_sysconfdir}
 %endif
 
+%if 0%{?_java}
+export JAVA_HOME=%{java_home}
+%endif
+
+%configure	--disable-strip \
+			--enable-pic \
+			--with-jnidir="%{_jnidir}" \
+			--with-jvmjardir="%{_jvmjardir}" \
+			--with-javadocdir="%{_javadocdir}"
+
+
 %build
 make clean
 make all
@@ -343,14 +361,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_jnidir}/libjni3270.so
 %{_jvmjardir}/pw3270.jar
 
-
-%dir %{_javadocdir}/%{name}/*
-%{_javadocdir}/%{name}/*
-
 %files -n %{name}-plugin-java
 %{_libdir}/@PACKAGE_NAME@-plugins/j3270.so
 %{_datadir}/pw3270/ui/80java.xml
 
+%files javadoc
+%dir %{_javadocdir}/%{name}/*
+%{_javadocdir}/%{name}/*
+
 %endif
 
 
diff --git a/src/java/Makefile.in b/src/java/Makefile.in
index 9644c84..d759cd5 100644
--- a/src/java/Makefile.in
+++ b/src/java/Makefile.in
@@ -177,7 +177,7 @@ jni3270.zip: \
 	@cp ../../ui/*java.xml ui
 	@zip -9 -m -r $@ ui
 	@rm -fr ui
-	
+
 	@zip -9 -j $@ $(BINRLS)@DLLDIR@/@DLLPREFIX@jni3270@DLLEXT@
 	@zip -9 -r $@ doc sample/efglobe.java sample/popup.java
 
@@ -245,6 +245,8 @@ install-extension: \
 install-doc: \
 	doc
 
+	@echo "javadocdir=$(javadocdir)"
+
 	@$(MKDIR) $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME)
 	@cp -r doc/* $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME)
 	@find $(DESTDIR)/$(javadocdir)/$(PACKAGE_NAME) -type f -exec chmod 644 {} \;
diff --git a/src/java/terminal.java b/src/java/terminal.java
index 06c7020..8b6de7a 100644
--- a/src/java/terminal.java
+++ b/src/java/terminal.java
@@ -293,7 +293,7 @@ public class terminal
 	/**
 	 * Get next field address.
 	 *
-	 * @param Field address.
+	 * @param baddr Field address.
 	 *
 	 * @return Address of the next field.
 	 *
--
libgit2 0.21.2