diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index 70ff2ae..f15e032 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -1,7 +1,7 @@
 
 Name:           aqute-bnd
 Version:        3.5.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
 License:        ASL 2.0
@@ -155,6 +155,19 @@ rm bnd-shared-maven-lib/src/main/java/aQute/bnd/maven/lib/resolve/DependencyReso
 %pom_remove_plugin -r :flatten-maven-plugin
 popd
 
+# Use compiler release flag when building on JDK >8 for correct cross-compiling
+%pom_xpath_inject pom:project "
+  <profiles>
+    <profile>
+      <id>jdk-release-flag</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <properties>
+        <maven.compiler.release>7</maven.compiler.release>
+      </properties>
+    </profile>
+  </profiles>"
 
 %mvn_alias biz.aQute.bnd:biz.aQute.bnd :bnd biz.aQute:bnd
 %mvn_alias biz.aQute.bnd:biz.aQute.bndlib :bndlib biz.aQute:bndlib
@@ -193,6 +206,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %license LICENSE
 
 %changelog
+* Tue Jul 21 2020 Mat Booth <mat.booth@redhat.com> - 3.5.0-10
+- Fix NIO linkage error when running on Java 8 due to incorrect cross-compilation
+
 * Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.5.0-9
 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11