diff --git a/sisu.spec b/sisu.spec
index 1dcf93f..4b1946b 100644
--- a/sisu.spec
+++ b/sisu.spec
@@ -1,12 +1,15 @@
+%bcond_with bootstrap
+
 Name:           sisu
-Summary:        Eclipse dependency injection framework
 Epoch:          1
 Version:        0.3.4
 Release:        4%{?dist}
+Summary:        Eclipse dependency injection framework
 # sisu is EPL-1.0, the bundled asm is BSD
 License:        EPL-1.0 and BSD
-
 URL:            http://eclipse.org/sisu
+BuildArch:      noarch
+
 Source0:        http://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/snapshot/releases/%{version}.tar.gz#/org.eclipse.sisu.inject-%{version}.tar.gz
 Source1:        http://git.eclipse.org/c/sisu/org.eclipse.sisu.plexus.git/snapshot/releases/%{version}.tar.gz#/org.eclipse.sisu.plexus-%{version}.tar.gz
 
@@ -19,9 +22,10 @@ Patch2:         sisu-ignored-tests.patch
 Patch3:         sisu-osgi-api.patch
 Patch4:         0001-Remove-dependency-on-glassfish-servlet-api.patch
 
-BuildArch:      noarch
-
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk8
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(com.google.inject.extensions:guice-servlet)
 BuildRequires:  mvn(com.google.inject:guice::no_aop:)
 BuildRequires:  mvn(javax.annotation:javax.annotation-api)
@@ -34,32 +38,20 @@ BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.osgi:osgi.core)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.testng:testng)
+%endif
 
 Provides:       bundled(objectweb-asm)
 
+Obsoletes:      %{name}-inject = 1:0.3.4-4
+Obsoletes:      %{name}-plexus = 1:0.3.4-4
+Provides:       %{name}-inject = %{epoch}:%{version}-%{release}
+Provides:       %{name}-plexus = %{epoch}:%{version}-%{release}
 
 %description
 Java dependency injection framework with backward support for plexus and bean
 style dependency injection.
 
-%package        inject
-Summary:        Sisu inject
-Obsoletes:      %{name}-tests < 1:0.3.2-5
-
-%description    inject
-This package contains %{summary}.
-
-%package        plexus
-Summary:        Sisu Plexus
-
-%description    plexus
-This package contains %{summary}.
-
-%package        javadoc
-Summary:        API documentation for Sisu
-
-%description    javadoc
-This package contains %{summary}.
+%{?javadoc_package}
 
 %prep
 %setup -q -c -T
@@ -80,7 +72,7 @@ cp %{SOURCE102} sisu-plexus/pom.xml
 %pom_xpath_set -r /pom:project/pom:version %{version}
 
 %mvn_file ":{*}" @1
-%mvn_package ":*{inject,plexus}" @1
+%mvn_package ":*{inject,plexus}"
 %mvn_package : __noinstall
 %mvn_alias :org.eclipse.sisu.plexus org.sonatype.sisu:sisu-inject-plexus
 
@@ -90,14 +82,8 @@ cp %{SOURCE102} sisu-plexus/pom.xml
 %install
 %mvn_install
 
-%files inject -f .mfiles-inject
-%doc sisu-inject/LICENSE.txt
-
-%files plexus -f .mfiles-plexus
-
-%files javadoc -f .mfiles-javadoc
-%doc sisu-inject/LICENSE.txt
-
+%files -f .mfiles
+%license sisu-inject/LICENSE.txt
 
 %changelog
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.4-4
@@ -115,9 +101,24 @@ cp %{SOURCE102} sisu-plexus/pom.xml
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.4-2
+- Build with OpenJDK 8
+
+* Wed Nov 06 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.4-1
+- Update to upstream version 0.3.4
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.3.3-9
+- Mass rebuild for javapackages-tools 201902
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.3-8
+- Merge inject and plexus subpackages
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.3-7
+- Mass rebuild for javapackages-tools 201901
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild