diff --git a/.gitignore b/.gitignore
index 1a4cf14..064764d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /javaparser-1.0.8-src.zip
 /javaparser-1.0.11.tar.gz
 /javaparser-parent-2.5.1.tar.gz
+/javaparser-parent-3.3.5.tar.gz
diff --git a/javaparser.spec b/javaparser.spec
index 691975a..0fd54eb 100644
--- a/javaparser.spec
+++ b/javaparser.spec
@@ -1,8 +1,8 @@
 Name:          javaparser
-Version:       2.5.1
+Version:       3.3.5
 Release:       1%{?dist}
-Summary:       Java 1.8 Parser Parser and Abstract Syntax Tree for Java
-License:       (GPLv3+ and LGPLv3+) or ASL 2.0
+Summary:       Java 1 to 9 Parser and Abstract Syntax Tree for Java
+License:       LGPLv3+ or ASL 2.0
 URL:           http://javaparser.org
 Source0:       https://github.com/javaparser/javaparser/archive/%{name}-parent-%{version}.tar.gz
 
@@ -10,11 +10,12 @@ BuildRequires:  maven-local
 BuildRequires:  mvn(biz.aQute.bnd:bnd-maven-plugin)
 BuildRequires:  mvn(net.java.dev.javacc:javacc)
 BuildRequires:  mvn(org.codehaus.mojo:javacc-maven-plugin)
+BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 
 BuildArch:     noarch
 
 %description
-This package contains a Java 1.8 Parser with AST generation and
+This package contains a Java 1 to 9 Parser with AST generation and
 visitor support. The AST records the source code structure, javadoc
 and comments. It is also possible to change the AST nodes or create new
 ones to modify the source code.
@@ -33,15 +34,30 @@ sed -i 's/\r//' readme.md
 # Remove plugins unnecessary for RPM builds
 %pom_remove_plugin :animal-sniffer-maven-plugin javaparser-core
 %pom_remove_plugin :maven-enforcer-plugin javaparser-core
-%pom_remove_plugin :coveralls-maven-plugin .
+%pom_remove_plugin :maven-source-plugin
+%pom_remove_plugin :coveralls-maven-plugin
 %pom_remove_plugin :jacoco-maven-plugin . javaparser-testing
 
 # Compatibility alias
 %mvn_alias :javaparser-core com.google.code.javaparser:javaparser
 
+# Fix javacc plugin name
+sed -i \
+  -e 's/ph-javacc-maven-plugin/javacc-maven-plugin/' \
+  -e 's/com.helger.maven/org.codehaus.mojo/' \
+  javaparser-core/pom.xml
+
+# Missing plugin
+%pom_remove_plugin :templating-maven-plugin javaparser-core
+
 # Missing dep on jbehave for testing
 %pom_disable_module javaparser-testing
 
+# Only need to ship the core module
+%mvn_package ":javaparser-core-generators" __noinstall
+%mvn_package ":javaparser-metamodel-generator" __noinstall
+%mvn_package ":javaparser-testing" __noinstall
+
 %build
 %mvn_build
 
@@ -56,6 +72,10 @@ sed -i 's/\r//' readme.md
 %license LICENSE LICENSE.APACHE LICENSE.GPL LICENSE.LGPL
 
 %changelog
+* Wed Feb 13 2019 Mat Booth <mat.booth@redhat.com> - 3.3.5-1
+- Update to javaparser 3.3.5 for Java 9 support
+- Correct license field to dual license: LGPLv3+ OR ASL 2.0
+
 * Wed Feb 13 2019 Mat Booth <mat.booth@redhat.com> - 2.5.1-1
 - Update to javaparser 2.5.1 for Java 1.8 support
 
diff --git a/sources b/sources
index e0c778d..aaeab27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (javaparser-parent-2.5.1.tar.gz) = e16bc056b2ba1eb5d36f488e7905836e3650680a2dd9c5a9c860ea108143cb4a5bb392a3dd22a6c2af083a9affa684aca1b093638871264185a3f3ec41fd0b45
+SHA512 (javaparser-parent-3.3.5.tar.gz) = 555002b992d7d7eeebb47057aa5f4285c7c4b10d5c723feaaaed97da7bd5314e9abb6adbd3ef54d92529ed80a0221e86e56e82e33d59bf5e866db7e3c3e0210a