diff --git a/lucene.spec b/lucene.spec
index c6855e8..32379ae 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:        8%{?dist}
+Release:        9%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://lucene.apache.org/
@@ -239,7 +239,9 @@ 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
+
+# optional on internal APIs that might not be present
+sed -i -e "/<Export-Package>/a<Import-Package>com.sun.management;resolution:=\"optional\",sun.misc;resolution:=\"optional\",*</Import-Package>" dev-tools/maven/pom.xml.template
 
 # compatibility with existing packages
 %mvn_alias :%{name}-analyzers-common :%{name}-analyzers
@@ -379,6 +381,10 @@ popd
 %license lucene/LICENSE.txt lucene/NOTICE.txt
 
 %changelog
+* Thu Aug 06 2020 Mat Booth <mat.booth@redhat.com> - 0:8.4.1-9
+- Add optional resolution on internal JDK APIs that might not be present on Java
+  11
+
 * Thu Aug 06 2020 Mat Booth <mat.booth@redhat.com> - 0:8.4.1-8
 - Avoid requirement on com.sun.management package