diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec
index aa9602e..0e4860e 100644
--- a/apache-commons-beanutils.spec
+++ b/apache-commons-beanutils.spec
@@ -1,61 +1,39 @@
 Name:          apache-commons-beanutils
-Version:       1.8.3
-Release:       2mamba
+Version:       1.9.4
+Release:       1mamba
 Summary:       Commons Beanutils Package
 Group:         Development/Libraries/Java
 Vendor:        openmamba
 Distribution:  openmamba
-Packager:      gil <puntogil@libero.it>
-URL:           http://commons.apache.org/beanutils/
-Source:        http://apache.panu.it/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
+URL:           http://commons.apache.org/proper/commons-beanutils/
+Source:        https://downloads.apache.org//commons/beanutils/binaries/commons-beanutils-%{version}-bin.tar.gz
 License:       Apache Software License Version 2.0
-BuildRequires: apache-ant
-BuildRequires: coreutils
-BuildRequires: jakarta-commons-collections
-BuildRequires: jakarta-commons-logging
-BuildRequires: java-junit3
-BuildRequires: jpackage-utils
-Requires:      jakarta-commons-collections
-Requires:      jakarta-commons-logging
-Requires:      jpackage-utils
+## AUTOBUILDREQ-BEGIN
+## AUTOBUILDREQ-END
+BuildRequires: javapackages
+#Requires:      jakarta-commons-collections
+#Requires:      jakarta-commons-logging
+Requires:      javapackages
 Provides:      apache-commons-beanutils18
-Obsoletes:     apache-commons-beanutils18
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+Obsoletes:     apache-commons-beanutils18 < 1.9.4
+Obsoletes:     apache-commons-beanutils-javadoc < 1.9.4
 
 %description
 The scope of this package is to create a package of Java utility methods for accessing and modifying the properties of arbitrary JavaBeans.  No dependencies outside of the JDK are required, so the use of this package is very lightweight.
 
-%package javadoc
-Group:          Documentation
-Summary:        Javadoc for %{name}
-
-%description javadoc
-Commons Beanutils Package
-
-This package contains javadoc for %{name}.
-
 %prep
+%setup -q -n commons-beanutils-%{version}
 
-%setup -q -n commons-beanutils-%{version}-src
-for j in $(find . -name "*.jar"); do
-	mv $j $j.no
-done
 %build
-export CLASSPATH=$(build-classpath commons-collections commons-logging)
-export OPT_JAR_LIST="/opt/java/ant/lib/ant-junit.jar $(build-classpath junit-4.5)"
-ant -Dbuild.sysclasspath=first dist
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
 mkdir -p %{buildroot}%{_javadir}/beanutils
 
-install -p -m 644 dist/commons-beanutils-%{version}.jar \
+install -p -m 644 commons-beanutils-%{version}.jar \
 	%{buildroot}%{_javadir}/beanutils/%{name}-%{version}.jar
-install -p -m 644 dist/commons-beanutils-core-%{version}.jar \
-	%{buildroot}%{_javadir}/beanutils/%{name}-core-%{version}.jar
-install -p -m 644 dist/commons-beanutils-bean-collections-%{version}.jar \
-	%{buildroot}%{_javadir}/beanutils/%{name}-bean-collections-%{version}.jar
 
 (
 	cd %{buildroot}%{_javadir}/beanutils
@@ -71,10 +49,6 @@ install -p -m 644 dist/commons-beanutils-bean-collections-%{version}.jar \
 	done
 )
 
-mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -82,26 +56,15 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 %defattr(-,root,root)
 %dir %{_javadir}/beanutils
 %{_javadir}/beanutils/apache-commons-beanutils-%{version}.jar
-%{_javadir}/beanutils/apache-commons-beanutils-bean-collections-%{version}.jar
-%{_javadir}/beanutils/apache-commons-beanutils-bean-collections.jar
-%{_javadir}/beanutils/apache-commons-beanutils-core-%{version}.jar
-%{_javadir}/beanutils/apache-commons-beanutils-core.jar
 %{_javadir}/beanutils/apache-commons-beanutils.jar
 %{_javadir}/beanutils/commons-beanutils-%{version}.jar
-%{_javadir}/beanutils/commons-beanutils-bean-collections-%{version}.jar
-%{_javadir}/beanutils/commons-beanutils-bean-collections.jar
-%{_javadir}/beanutils/commons-beanutils-core-%{version}.jar
-%{_javadir}/beanutils/commons-beanutils-core.jar
 %{_javadir}/beanutils/commons-beanutils.jar
-%doc dist/LICENSE.txt dist/NOTICE.txt 
-%doc dist/README.txt dist/RELEASE-NOTES.txt
-
-%files javadoc
-%defattr(-,root,root)
-%{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
+%doc LICENSE.txt
 
 %changelog
+* Tue Jun 01 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.9.4-1mamba
+- update to 1.9.4
+
 * Tue Aug 16 2011 Silvan Calarco <silvan.calarco@mambasoft.it> 1.8.3-2mamba
 - obsolete apache-commons-beanutils18