diff --git a/.gitignore b/.gitignore
index 1b0e26d..1a4cf14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /javaparser-1.0.8-src.zip
 /javaparser-1.0.11.tar.gz
+/javaparser-parent-2.5.1.tar.gz
diff --git a/javaparser.spec b/javaparser.spec
index 933be07..691975a 100644
--- a/javaparser.spec
+++ b/javaparser.spec
@@ -1,55 +1,64 @@
 Name:          javaparser
-Version:       1.0.11
-Release:       7%{?dist}
-Summary:       Java 1.7 Parser and AST
-License:       GPLv3+ and LGPLv3+
-# https://github.com/before/javaparser/
-URL:           http://javaparser.github.io/javaparser/
-Source0:       https://github.com/javaparser/javaparser/archive/%{name}-%{version}.tar.gz
+Version:       2.5.1
+Release:       1%{?dist}
+Summary:       Java 1.8 Parser Parser and Abstract Syntax Tree for Java
+License:       (GPLv3+ and LGPLv3+) or ASL 2.0
+URL:           http://javaparser.org
+Source0:       https://github.com/javaparser/javaparser/archive/%{name}-parent-%{version}.tar.gz
 
-BuildRequires: maven-local
-BuildRequires: mvn(junit:junit)
-BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
-BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin)
-BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
+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)
 
 BuildArch:     noarch
 
 %description
-A Java 1.7 Parser with AST generation and visitor support.
-The AST records the source code structure, java doc and
-comments. It is also possible to change the AST nodes or
-create new ones to modify the source code.
+This package contains a Java 1.8 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.
 
 %package javadoc
-Summary:       Javadoc for %{name}
+Summary: Javadoc for %{name}
 
 %description javadoc
-This package contains javadoc for %{name}.
+This package contains API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}
+%setup -q -n %{name}-%{name}-parent-%{version}
 
 sed -i 's/\r//' readme.md
 
-%mvn_file :%{name} %{name}
+# 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 :jacoco-maven-plugin . javaparser-testing
+
+# Compatibility alias
+%mvn_alias :javaparser-core com.google.code.javaparser:javaparser
+
+# Missing dep on jbehave for testing
+%pom_disable_module javaparser-testing
 
 %build
-
-# test skip http://code.google.com/p/javaparser/issues/detail?id=43
 %mvn_build
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc readme.md
-%license COPYING COPYING.LESSER
+%doc readme.md changelog.md
+%license LICENSE LICENSE.APACHE LICENSE.GPL LICENSE.LGPL
 
 %files javadoc -f .mfiles-javadoc
-%license COPYING COPYING.LESSER
+%license LICENSE LICENSE.APACHE LICENSE.GPL LICENSE.LGPL
 
 %changelog
+* 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
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.11-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 0791ae7..e0c778d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e8dacc8e02f05b342e920a7aa1ad56a8  javaparser-1.0.11.tar.gz
+SHA512 (javaparser-parent-2.5.1.tar.gz) = e16bc056b2ba1eb5d36f488e7905836e3650680a2dd9c5a9c860ea108143cb4a5bb392a3dd22a6c2af083a9affa684aca1b093638871264185a3f3ec41fd0b45