diff --git a/netty.spec b/netty.spec
index 18d92b2..fa33ac5 100644
--- a/netty.spec
+++ b/netty.spec
@@ -2,13 +2,12 @@
 %global debug_package %{nil}
 %global namedreltag .Final
 %global namedversion %{version}%{?namedreltag}
-%global java_version 1.8.0
 
 %bcond_without  jp_minimal
 
 Name:           netty
 Version:        4.1.13
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        An asynchronous event-driven network application framework and tools for Java
 License:        ASL 2.0
 URL:            https://netty.io/
@@ -37,7 +36,6 @@ BuildRequires:  mvn(org.codehaus.mojo:exec-maven-plugin)
 BuildRequires:  mvn(org.fusesource.hawtjni:maven-hawtjni-plugin)
 BuildRequires:  mvn(org.jctools:jctools-core)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
-BuildRequires:  java-%{java_version}-openjdk-devel
 %if %{without jp_minimal}
 BuildRequires:  mvn(com.fasterxml:aalto-xml)
 BuildRequires:  mvn(com.github.jponge:lzma-java)
@@ -88,16 +86,15 @@ Summary:   API documentation for %{name}
 # remove unnecessary dependency on parent POM
 %pom_remove_parent . bom dev-tools
 
+# Disable all in one jar
+%pom_disable_module all
+
 # Missing Mavenized rxtx
 %pom_disable_module "transport-rxtx"
-%pom_remove_dep ":netty-transport-rxtx" all
 # Missing com.barchart.udt:barchart-udt-bundle:jar:2.3.0
 %pom_disable_module "transport-udt"
-%pom_remove_dep ":netty-transport-udt" all
-%pom_remove_dep ":netty-build" all
 # Not needed
 %pom_disable_module "example"
-%pom_remove_dep ":netty-example" all
 %pom_disable_module "testsuite"
 %pom_disable_module "testsuite-autobahn"
 %pom_disable_module "testsuite-osgi"
@@ -162,7 +159,6 @@ sed -i '/BouncyCastleSelfSignedCertGenerator/s/.*/throw new UnsupportedOperation
     handler/src/main/java/io/netty/handler/ssl/util/SelfSignedCertificate.java
 %pom_remove_dep -r com.fasterxml:aalto-xml
 %pom_disable_module codec-xml
-%pom_remove_dep :netty-codec-xml all
 %pom_remove_dep -r com.github.jponge:lzma-java
 rm codec/src/*/java/io/netty/handler/codec/compression/Lzma*.java
 %pom_remove_dep -r com.ning:compress-lzf
@@ -175,13 +171,9 @@ rm common/*/main/java/io/netty/util/internal/logging/Log4J2*.java
 # Disable rarely needed native artifacts
 %pom_disable_module transport-native-epoll
 %pom_disable_module transport-native-kqueue
-%pom_remove_dep :netty-transport-native-epoll all
-%pom_remove_dep :netty-transport-native-kqueue all
-%endif
 
-sed -i 's|taskdef|taskdef classpathref="maven.plugin.classpath"|' all/pom.xml
+%endif
 
-%pom_xpath_inject "pom:plugins/pom:plugin[pom:artifactId = 'maven-antrun-plugin']" '<dependencies><dependency><groupId>ant-contrib</groupId><artifactId>ant-contrib</artifactId><version>1.0b3</version></dependency></dependencies>' all/pom.xml
 %pom_xpath_inject "pom:execution[pom:id = 'build-native-lib']/pom:configuration" '<verbose>true</verbose>' transport-native-epoll/pom.xml
 
 # Upstream has jctools bundled.
@@ -195,17 +187,12 @@ sed -i 's|taskdef|taskdef classpathref="maven.plugin.classpath"|' all/pom.xml
 %mvn_package ':*-tests' __noinstall
 
 %build
-# Ensure we get the jit on arm
-%ifarch %{arm}
-export JAVA_HOME=$(ls -d %{_jvmdir}/java-%{java_version}-openjdk-aarch32*)
-%else
 export JAVA_HOME=%{_jvmdir}/java
-%endif
 
 # Ensure we use distro compile flags
 export CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 
-%mvn_build -f
+%mvn_build -f -- -Dsource=1.8
 
 %install
 %mvn_install
@@ -217,6 +204,10 @@ export CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 %license LICENSE.txt NOTICE.txt
 
 %changelog
+* Fri Jul 24 2020 Mat Booth <mat.booth@redhat.com> - 4.1.13-18
+- Don't ship the bundled all-in-one jar
+- Fix java 11 build
+
 * Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 4.1.13-17
 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11