diff --git a/javahelp2.spec b/javahelp2.spec
index b4e16da..04745ae 100644
--- a/javahelp2.spec
+++ b/javahelp2.spec
@@ -1,41 +1,29 @@
 Name:          javahelp2
 Version:       2.0.05
-Release:       2mamba
+Release:       3mamba
 Summary:       The JavaHelp System
 Group:         Development/Libraries/Java
 Vendor:        openmamba
 Distribution:  openmamba
-Packager:      gil <puntogil@libero.it>
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://javahelp.dev.java.net/
 Source0:       https://javahelp.dev.java.net/files/documents/5985/59373/javahelp2-src-%{version}.zip
 Source1:       javahelp2-jhindexer.sh
 Source2:       javahelp2-jhsearch.sh
 License:       GPL
+## AUTOBUILDREQ-BEGIN
+## AUTOBUILDREQ-END
+BuildRequires: java-openjdk8
 BuildRequires: apache-ant 
 BuildRequires: apache-ant-nodeps
-BuildRequires: apache-tomcat5-jsp20-api
-BuildRequires: apache-tomcat5-servletapi5
-BuildRequires: jpackage-utils
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+BuildRequires: javapackages
 
 %description
 JavaHelp software is a full-featured, platform-independent, extensible help system that enables developers and authors to incorporate online
 help in applets, components, applications, operating systems, and devices. Authors can also use the JavaHelp software to deliver online
 documentation for the Web and corporate Intranet.
 
-%package        javadoc
-Summary:        Javadoc for %{name}
-Group:          Documentation
-
-%description    javadoc
-JavaHelp software is a full-featured, platform-independent, extensible help system that enables developers and authors to incorporate online
-help in applets, components, applications, operating systems, and devices. Authors can also use the JavaHelp software to deliver online
-documentation for the Web and corporate Intranet.
-
-This package contains javadoc for %{name}.
-
 %prep
-
 %setup -q
 chmod -R go=u-w *
 
@@ -58,12 +46,13 @@ pushd javahelp_nbproject/lib
 popd
 
 %build
-
 export CLASSPATH=$(build-classpath jsp-api20 servletapi5 ant/ant-nodeps junit-3.8.2)
+export JAVA_HOME=%{_jvmdir}/java-8
+#export JAVA_CMD=%{_jvmdir}/java-8/bin/java
 ant -f javahelp_nbproject/build.xml \
 	-Djdic-jar-present=true -Djdic-zip-present=true \
 	-Dservlet-jar-present=true -Dtomcat-zip-present=true \
-	release javadoc
+	release
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -92,9 +81,6 @@ install -m 755 %{S:2} %{buildroot}%{_bindir}/jh2search
 
 mkdir -p %{buildroot}%{_datadir}/%{name}
 
-mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr javahelp_nbproject/dist/lib/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -112,11 +98,10 @@ cp -pr javahelp_nbproject/dist/lib/javadoc/* %{buildroot}%{_javadocdir}/%{name}-
 %{_javadir}/javahelp2/jhbasic.jar
 %dir %{_datadir}/%{name}
 
-%files javadoc
-%defattr(-,root,root)
-%{_javadocdir}/%{name}-%{version}
-
 %changelog
+* Sun Apr 11 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2.0.05-3mamba
+- rebuilt
+
 * Sat Nov 27 2010 gil <puntogil@libero.it> 2.0.05-2mamba
 - rebuilt devel