diff --git a/lucene.spec b/lucene.spec
index bb1ebed..c6855e8 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -3,7 +3,7 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        8.4.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://lucene.apache.org/
@@ -239,6 +239,7 @@ mkdir -p lucene/build/analysis/{kuromoji,nori}
 
 # don't generate uses clauses in osgi metadata
 sed -i -e "/<Export-Package>/a<_nouses>true</_nouses>" dev-tools/maven/pom.xml.template
+sed -i -e "/<Export-Package>/a<Import-Package>!com.sun.management,*</Import-Package>" dev-tools/maven/pom.xml.template
 
 # compatibility with existing packages
 %mvn_alias :%{name}-analyzers-common :%{name}-analyzers
@@ -335,7 +336,7 @@ popd
     </profile>"
 
 # For some reason TestHtmlParser.testTurkish fails when building inside SCLs
-%mvn_build -s -f
+%mvn_build -s -f -- -Dcheckoutid=%{version}
 
 %install
 %mvn_install
@@ -378,6 +379,9 @@ popd
 %license lucene/LICENSE.txt lucene/NOTICE.txt
 
 %changelog
+* Thu Aug 06 2020 Mat Booth <mat.booth@redhat.com> - 0:8.4.1-8
+- Avoid requirement on com.sun.management package
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:8.4.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild