diff --git a/ant-antunit.spec b/ant-antunit.spec
index cd6910a..1658525 100644
--- a/ant-antunit.spec
+++ b/ant-antunit.spec
@@ -2,24 +2,18 @@
 
 Name:             ant-%{base_name}
 Version:          1.3
-Release:          7%{?dist}
+Release:          8%{?dist}
 Summary:          Provide antunit ant task
-Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://ant.apache.org/antlibs/%{base_name}/
 Source0:          http://www.apache.org/dist/ant/antlibs/%{base_name}/source/apache-%{name}-%{version}-src.tar.bz2
 BuildArch:        noarch
 
-BuildRequires:    java-devel >= 1:1.6.0
-BuildRequires:    jpackage-utils
+BuildRequires:    javapackages-local
 BuildRequires:    ant
 BuildRequires:    ant-junit
 BuildRequires:    ant-testutil
 
-Requires:         java-headless >= 1:1.6.0
-Requires:         jpackage-utils
-Requires:         ant
-
 
 %description
 The <antunit> task drives the tests much like <junit> does for JUnit tests.
@@ -53,38 +47,28 @@ ant package
 
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}/ant
-install -pm 644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/ant/%{name}.jar
-install -d -m 0755 %{buildroot}%{_datadir}/ant/lib
-ln -s ../../java/ant/%{name}.jar %{buildroot}%{_datadir}/ant/lib
-
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 %{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP.ant-%{name}.pom
-%add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}/
+%mvn_artifact %{name}-%{version}.pom build/lib/%{name}-%{version}.jar
+%mvn_file ":ant-antunit" ant/ant-antunit
+%mvn_install -J docs/
 
 # OPT_JAR_LIST fragments
 mkdir -p %{buildroot}%{_sysconfdir}/ant.d
-echo "%{base_name} ant/%{name}" > %{buildroot}%{_sysconfdir}/ant.d/%{base_name}
+echo "ant/%{name}" > %{buildroot}%{_sysconfdir}/ant.d/%{base_name}
 
 
 %files -f .mfiles
-%license LICENSE
-%doc CONTRIBUTORS NOTICE README README.html WHATSNEW
+%license LICENSE NOTICE
+%doc CONTRIBUTORS README README.html WHATSNEW
 %config(noreplace) %{_sysconfdir}/ant.d/%{base_name}
-%{_datadir}/ant/lib/%{name}.jar
 
-%files javadoc
-%license LICENSE
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%license LICENSE NOTICE
 
 
 %changelog
+* Wed Aug 23 2017 Mat Booth <mat.booth@redhat.com> - 1.3-8
+- Fix failure to build from source
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild