diff --git a/dtdparser.spec b/dtdparser.spec
index 528696f..64fd22c 100644
--- a/dtdparser.spec
+++ b/dtdparser.spec
@@ -30,7 +30,7 @@
 
 Name:           dtdparser
 Version:        1.21
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        A Java DTD Parser
 
 # The code has no license attribution.
@@ -46,12 +46,8 @@ Source1:        http://repo1.maven.org/maven2/com/wutka/%{name}/%{version}/%{nam
 # Without removing these comments, build fails
 Patch0:         %{name}-unmappable-chars-in-comments.patch
 
-BuildRequires:  ant
-BuildRequires:  java-devel
-BuildRequires:  jpackage-utils
-
-Requires:       java-headless
-Requires:       jpackage-utils
+BuildRequires: ant
+BuildRequires: javapackages-local
 
 %description
 DTD parsers for Java seem to be pretty scarce. That's probably because
@@ -60,10 +56,10 @@ accepted, no one will need DTD parsers anymore. Until then, you can
 use this library to parse a DTD.
 
 %package javadoc
-Summary:        Javadoc for %{name}
+Summary: Javadoc for %{name}
 
 %description javadoc
-Javadoc for %{name}.
+This package contains API documentation for %{name}.
 
 %prep
 %setup -q
@@ -79,29 +75,20 @@ sed -i "s,59 Temple Place,51 Franklin Street,;s,Suite 330,Fifth Floor,;s,02111-1
 ant build createdoc
 
 %install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/%{name}120.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# POM
-install -d -m 0755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%mvn_artifact %{SOURCE1} dist/%{name}120.jar
+%mvn_install -J doc
 
 %files -f .mfiles
-%doc CHANGES LICENSE README ASL_LICENSE
-
+%doc CHANGES README
+%license LICENSE ASL_LICENSE
 
-%files javadoc
-%doc %{_javadocdir}/*
-%doc LICENSE ASL_LICENSE
+%files javadoc -f .mfiles-javadoc
+%license LICENSE ASL_LICENSE
 
 %changelog
+* Fri Feb 08 2019 Mat Booth <mat.booth@redhat.com> - 1.21-23
+- Install with xmvn and drop deprecated macros
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild