diff --git a/SPECS/glassfish-jsp.spec b/SPECS/glassfish-jsp.spec
index a965add..518d7ef 100644
--- a/SPECS/glassfish-jsp.spec
+++ b/SPECS/glassfish-jsp.spec
@@ -3,7 +3,7 @@
 
 Name:       glassfish-jsp
 Version:    2.3.4
-Release:    3%{?dist}
+Release:    6%{?dist}
 Summary:    Glassfish J2EE JSP API implementation
 # Classes in package "org.apache.jasper" are Apache licensed
 License:    (CDDL-1.1 or GPLv2 with exceptions) and ASL 2.0
@@ -50,6 +50,8 @@ pushd impl
 %patch0 -p1
 %patch1 -p1
 
+%pom_xpath_set "/pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source"  "1.8"
+%pom_xpath_set "/pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target"  "1.8"
 %pom_add_dep org.eclipse.jdt:core::provided
 
 %mvn_alias : "org.eclipse.jetty.orbit:org.apache.jasper.glassfish"
@@ -61,11 +63,17 @@ pushd impl
 %pom_remove_plugin :maven-javadoc-plugin
 %pom_remove_plugin :maven-gpg-plugin
 %pom_remove_plugin :maven-source-plugin
+
+# These three files are excluded from compilation by upstream, delete them to avoid javadoc problems
+rm src/main/java/org/apache/jasper/compiler/AntJavaCompiler.java \
+   src/main/java/org/apache/jasper/util/SystemLogHandler.java \
+   src/main/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java
+
 popd
 
 %build
 pushd impl
-%mvn_build
+%mvn_build -- -Dsource=1.8 -Ddoclint=none
 popd
 
 %install
@@ -92,6 +100,15 @@ popd
 %license LICENSE-ASL-2.0.txt LICENSE
 
 %changelog
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.3.4-6
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Tue Jul 07 2020 Mat Booth <mat.booth@redhat.com> - 2.3.4-5
+- Avoid javadoc problems restricting build to Java 8
+
+* Fri Jun 26 2020 Jeff Johnston <jjohnstn@redhat.com> - 2.3.4-4
+- Set to use Java 1.8 as package needs javax.servlet
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
@@ -213,4 +230,4 @@ popd
 - Fix whitespace
 
 * Wed Mar 21 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.2.1-1
-- Initial version of the package
+- Initial version of the package
\ No newline at end of file