diff --git a/java-lucene.spec b/java-lucene.spec
index 5eada6a..c970e23 100644
--- a/java-lucene.spec
+++ b/java-lucene.spec
@@ -1,37 +1,39 @@
 %define        javahome    %{_jvmdir}/jdk
 Name:          java-lucene
-Version:       2.4.1
-Release:       3mamba
+Version:       8.5.1
+Release:       1mamba
 Summary:       High-performance, full-featured text search engine
 Group:         Applications/Networking
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://lucene.apache.org/
-Source0:       http://www.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz
+Source0:       https://downloads.apache.org/lucene/java/%{version}/lucene-%{version}.tgz
 Source1:       java-lucene-1.9-OSGi-MANIFEST.MF
 Source2:       java-lucene-1.9-analysis-OSGi-MANIFEST.MF
 Patch0:        java-lucene-2.4.1-db-javadoc.patch
 Patch1:        java-lucene-2.4.1-fixmanifests.patch
 Patch2:        java-lucene-2.4.1-Xmax.patch
 License:       Apache Software License 2.0
-BuildRequires: apache-ant
-BuildRequires: apache-ant-junit
-BuildRequires: jakarta-commons-beanutils
-BuildRequires: jakarta-commons-digester
-BuildRequires: jakarta-commons-logging
-BuildRequires: java-jline
-BuildRequires: jakarta-regexp
-%if "%{stage1}" != "1"
-BuildRequires: java-BDB3
-BuildRequires: java-bdb48
-%endif
-BuildRequires: javacc
-BuildRequires: java-junit3
-BuildRequires: java-tidy
+## AUTOBUILDREQ-BEGIN
+## AUTOBUILDREQ-END
+#BuildRequires: apache-ant
+#BuildRequires: apache-ant-junit
+#BuildRequires: jakarta-commons-beanutils
+#BuildRequires: jakarta-commons-digester
+#BuildRequires: jakarta-commons-logging
+#BuildRequires: java-jline
+#BuildRequires: jakarta-regexp
+#%if "%{stage1}" != "1"
+#BuildRequires: java-BDB3
+#BuildRequires: java-bdb48
+#%endif
+#BuildRequires: javacc
+#BuildRequires: java-junit3
+#BuildRequires: java-tidy
 BuildRequires: jpackage-utils
-BuildRequires: xerces-j2
-BuildRequires: xml-commons-apis
+#BuildRequires: xerces-j2
+#BuildRequires: xml-commons-apis
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -109,15 +111,16 @@ This package contains manual for %{name}.
 
 %prep
 %setup -q -n lucene-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-for j in $(find . -name "*.jar"); do
-	mv $j ${j}.no
-done
+#%patch0 -p1
+#%patch1 -p1
+#%patch2 -p1
+#
+#for j in $(find . -name "*.jar"); do
+#	mv $j ${j}.no
+#done
 
 %build
+:<< __OBSOLETE
 mkdir -p docs
 mkdir -p lib
 unset JAVA_HOME
@@ -148,6 +151,17 @@ zip -u build/contrib/analyzers/lucene-analyzers-%{version}.jar META-INF/MANIFEST
 
 mkdir -p %{buildroot}%{_javadir}
 
+for f in sandbox memory grouping highlighter backward-codecs benchmark replicator demo expressions classification \
+         suggest misc core queries luke spatial-extras facet codecs monitor join spatial3d; do
+   install -m 644 $f/lucene-$f-%{version}.jar \
+	 %{buildroot}%{_javadir}/lucene-$f-%{version}.jar
+   ln -sf lucene-$f-%{version}.jar %{buildroot}%{_javadir}/lucene-$f.jar
+done
+
+ln -sf lucene-core-%{version}.jar %{buildroot}%{_javadir}/lucene.jar
+ln -sf lucene-core-%{version}.jar %{buildroot}%{_javadir}/lucene-%{version}.jar
+
+:<< __OBSOLETE
 install -m 644 build/lucene-core-%{version}.jar \
 	%{buildroot}%{_javadir}/lucene-%{version}.jar
 install -m 644 build/lucene-demos-%{version}.jar  \
@@ -225,55 +239,58 @@ rm -rf docs/skin/translations
 %{_javadir}/lucene.jar
 %{_javadir}/lucene-core-%{version}.jar
 %{_javadir}/lucene-core.jar
-%{_datadir}/lucene-%{version}
-%doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt
+#%{_datadir}/lucene-%{version}
+%doc LICENSE.txt
+#CHANGES.txt NOTICE.txt README.txt
 
 %files contrib
 %defattr(-,root,root)
-%{_javadir}/lucene-contrib/lucene-analyzers-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-analyzers.jar
-%{_javadir}/lucene-contrib/lucene-ant-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-ant.jar
-%{_javadir}/lucene-contrib/lucene-benchmark-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-benchmark.jar
-%{_javadir}/lucene-contrib/lucene-highlighter-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-highlighter.jar
-%{_javadir}/lucene-contrib/lucene-instantiated-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-instantiated.jar
-%{_javadir}/lucene-contrib/lucene-lucli-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-lucli.jar
-%{_javadir}/lucene-contrib/lucene-memory-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-memory.jar
-%{_javadir}/lucene-contrib/lucene-misc-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-misc.jar
-%{_javadir}/lucene-contrib/lucene-queries-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-queries.jar
-%{_javadir}/lucene-contrib/lucene-regex-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-regex.jar
-%{_javadir}/lucene-contrib/lucene-similarity-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-similarity.jar
-%{_javadir}/lucene-contrib/lucene-snowball-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-snowball.jar
-%{_javadir}/lucene-contrib/lucene-spellchecker-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-spellchecker.jar
-%{_javadir}/lucene-contrib/lucene-surround-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-surround.jar
-%{_javadir}/lucene-contrib/lucene-swing-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-swing.jar
-%{_javadir}/lucene-contrib/lucene-wikipedia-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-wikipedia.jar
-%{_javadir}/lucene-contrib/lucene-wordnet-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-wordnet.jar
-%{_javadir}/lucene-contrib/lucene-xml-query-parser-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-xml-query-parser.jar
-%doc contrib/CHANGES.txt
+%{_javadir}/lucene-backward-codecs-%{version}.jar
+%{_javadir}/lucene-backward-codecs.jar
+%{_javadir}/lucene-benchmark-%{version}.jar
+%{_javadir}/lucene-benchmark.jar
+%{_javadir}/lucene-classification-%{version}.jar
+%{_javadir}/lucene-classification.jar
+%{_javadir}/lucene-codecs-%{version}.jar
+%{_javadir}/lucene-codecs.jar
+%{_javadir}/lucene-expressions-%{version}.jar
+%{_javadir}/lucene-expressions.jar
+%{_javadir}/lucene-facet-%{version}.jar
+%{_javadir}/lucene-facet.jar
+%{_javadir}/lucene-grouping-%{version}.jar
+%{_javadir}/lucene-grouping.jar
+%{_javadir}/lucene-highlighter-%{version}.jar
+%{_javadir}/lucene-highlighter.jar
+%{_javadir}/lucene-join-%{version}.jar
+%{_javadir}/lucene-join.jar
+%{_javadir}/lucene-luke-%{version}.jar
+%{_javadir}/lucene-luke.jar
+%{_javadir}/lucene-memory-%{version}.jar
+%{_javadir}/lucene-memory.jar
+%{_javadir}/lucene-misc-%{version}.jar
+%{_javadir}/lucene-misc.jar
+%{_javadir}/lucene-monitor-%{version}.jar
+%{_javadir}/lucene-monitor.jar
+%{_javadir}/lucene-queries-%{version}.jar
+%{_javadir}/lucene-queries.jar
+%{_javadir}/lucene-replicator-%{version}.jar
+%{_javadir}/lucene-replicator.jar
+%{_javadir}/lucene-sandbox-%{version}.jar
+%{_javadir}/lucene-sandbox.jar
+%{_javadir}/lucene-spatial-extras-%{version}.jar
+%{_javadir}/lucene-spatial-extras.jar
+%{_javadir}/lucene-spatial3d-%{version}.jar
+%{_javadir}/lucene-spatial3d.jar
+%{_javadir}/lucene-suggest-%{version}.jar
+%{_javadir}/lucene-suggest.jar
+#%doc contrib/CHANGES.txt
 
-%files contrib-db
-%defattr(-,root,root)
-%{_javadir}/lucene-contrib/lucene-bdb-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-bdb-je-%{version}.jar
-%{_javadir}/lucene-contrib/lucene-bdb-je.jar
-%{_javadir}/lucene-contrib/lucene-bdb.jar
+#%files contrib-db
+#%defattr(-,root,root)
+#%{_javadir}/lucene-contrib/lucene-bdb-%{version}.jar
+#%{_javadir}/lucene-contrib/lucene-bdb-je-%{version}.jar
+#%{_javadir}/lucene-contrib/lucene-bdb-je.jar
+#%{_javadir}/lucene-contrib/lucene-bdb.jar
 
 #%files contrib-db-javadoc
 #%defattr(-,root,root)
@@ -284,8 +301,8 @@ rm -rf docs/skin/translations
 
 %files demo
 %defattr(-,root,root)
-%{_javadir}/lucene-demos-%{version}.jar
-%{_javadir}/lucene-demos.jar
+%{_javadir}/lucene-demo-%{version}.jar
+%{_javadir}/lucene-demo.jar
 
 #%files javadoc-jars
 #%defattr(-,root,root)
@@ -328,16 +345,19 @@ rm -rf docs/skin/translations
 #%{_javadocdir}/lucene-%{version}-jars/lucene-xml-query-parser-%{version}-javadoc.jar
 #%{_javadocdir}/lucene-%{version}-jars/lucene-xml-query-parser-javadoc.jar
 
-%files javadoc
-%defattr(-,root,root)
-%{_javadocdir}/lucene-%{version}
-%{_javadocdir}/lucene
+#%files javadoc
+#%defattr(-,root,root)
+#%{_javadocdir}/lucene-%{version}
+#%{_javadocdir}/lucene
 
-%files manual
-%defattr(-,root,root)
-%doc docs
+#%files manual
+#%defattr(-,root,root)
+#%doc docs
 
 %changelog
+* Thu May 07 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 8.5.1-1mamba
+- update to 8.5.1
+
 * Tue Jan 18 2011 gil <puntogil@libero.it> 2.4.1-3mamba
 - rebuilt with new java-bdb48
 - rebuilt with java-openjdk