diff --git a/generate-tarball.sh b/generate-tarball.sh
index 782770d..49786ce 100755
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -9,13 +9,13 @@ wget "https://github.com/jhy/${name}/archive/${name}-${version}.tar.gz" -O "${na
 
 rm -rf tarball-tmp
 mkdir tarball-tmp
-cd tarball-tmp
-tar xf "../${name}-${version}.orig.tar.gz"
+pushd tarball-tmp
+tar -xf "../${name}-${version}.orig.tar.gz"
 
 # CLEAN TARBALL
 # contains scraped news articles (non-free)
-rm -r */src/test/resources
+rm -r "${name}-${name}-${version}/src/test/resources"
 
-tar cf "../${name}-${version}.tar.gz" *
-cd ..
+tar -czf "../${name}-${version}.tar.gz" *
+popd
 rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
diff --git a/jsoup.spec b/jsoup.spec
index ebc56d1..bf8220c 100644
--- a/jsoup.spec
+++ b/jsoup.spec
@@ -1,20 +1,24 @@
+%bcond_with bootstrap
+
 Name:           jsoup
-Summary:        Java library for working with real-world HTML
 Version:        1.13.1
 Release:        5%{?dist}
+Summary:        Java library for working with real-world HTML
 License:        MIT
-
 URL:            http://jsoup.org/
+BuildArch:      noarch
 
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
 # The sources contain non-free scraped web pages as test data
 Source1:        generate-tarball.sh
 
-BuildArch:      noarch
-
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk8
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+%endif
 
 %description
 jsoup is a Java library for working with real-world HTML.
@@ -35,12 +39,8 @@ jsoup is designed to deal with all varieties of HTML found in the wild;
 from pristine and validating, to invalid tag-soup;
 jsoup will create a sensible parse tree.
 
-
-%package javadoc
-Summary:        Javadoc for %{name}
-
-%description javadoc
-API documentation for %{name}.
+%{?module_package}
+%{?javadoc_package}
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
@@ -60,13 +60,10 @@ API documentation for %{name}.
 %install
 %mvn_install
 
-%files -f .mfiles
+%files -n %{?module_prefix}%{name} -f .mfiles
 %doc README.md CHANGES
 %license LICENSE
 
-%files javadoc -f .mfiles-javadoc
-%license LICENSE
-
 %changelog
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -74,6 +71,9 @@ API documentation for %{name}.
 * Fri Aug 28 2020 Mat Booth <mat.booth@redhat.com> - 1.13.1-4
 - Expose internal packages in the OSGi metadata
 
+* Tue Aug 25 2020 Marian Koncek <mkoncek@redhat.com> - 1.13.1-1
+- Update to upstream version 1.13.1
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
@@ -86,12 +86,24 @@ API documentation for %{name}.
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.12.1-3
+- Build with OpenJDK 8
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.12.1-2
+- Mass rebuild for javapackages-tools 201902
+
 * Sun Oct 20 2019 Fabio Valentini <decathorpe@gmail.com> - 1.12.1-1
 - Update to version 1.12.1.
 
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Thu Jul 04 2019 Marian Koncek <mkoncek@redhat.com> - 1.12.1-1
+- Update to upstream version 1.12.1
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11.3-4
+- Mass rebuild for javapackages-tools 201901
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
@@ -185,4 +197,3 @@ API documentation for %{name}.
 
 * Fri Jul 22 2011 Jaromir Capik <jcapik@redhat.com> - 1.6.1-1
 - Initial package
-
diff --git a/sources b/sources
index 583d3d8..df80e4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jsoup-1.13.1.tar.gz) = e8b0b123a6fada1e62ee4d11b01aad82fddbf7704be63ee475a9c49096469c7307f5724f3ceb9cdc2a1e0bbac2873cd3b4322ab13c98515df9c94249fd913896
+SHA512 (jsoup-1.13.1.tar.gz) = b00bf53e2692e01a32870579d259b0bc7c78a7d13e44975f6692b9f92852224a0f5d3631b59eeaf41e00c2ccdc097983ba836eca62b998cb332b91fa9c713dd6