diff --git a/xmlunit.changes b/xmlunit.changes
index f1118c6..1dd94c2 100644
--- a/xmlunit.changes
+++ b/xmlunit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Nov  7 20:46:02 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Do not depend on a particular xml-commons-apis provider.
+
 -------------------------------------------------------------------
 Tue Sep 19 07:20:04 UTC 2017 - fstrba@suse.com
 
diff --git a/xmlunit.spec b/xmlunit.spec
index 398d9da..ec28fb6 100644
--- a/xmlunit.spec
+++ b/xmlunit.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xmlunit
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2008, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -13,7 +13,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -23,7 +23,7 @@ Release:        0
 Summary:        Provides classes to do asserts on XML
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
-Url:            http://xmlunit.sourceforge.net/
+URL:            http://xmlunit.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-src.zip
 Source1:        http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
 BuildRequires:  ant
@@ -36,11 +36,11 @@ BuildRequires:  junit
 BuildRequires:  unzip
 BuildRequires:  xalan-j2
 BuildRequires:  xerces-j2
-BuildRequires:  xml-commons-jaxp-1.3-apis
+BuildRequires:  xml-commons-apis >= 1.3
 Requires:       junit
 Requires:       xalan-j2
 Requires:       xerces-j2
-Requires:       xml-commons-jaxp-1.3-apis
+Requires:       xml-commons-apis >= 1.3
 BuildArch:      noarch
 
 %description
@@ -82,7 +82,8 @@ ant -Djavac.source=1.6 -Djavac.target=1.6 -Dbuild.compiler=modern -Dhaltonfailur
 
 %install
 mkdir -p %{buildroot}%{_javadir}
-install -m 0644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 0644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir}/ && ln -s %{name}-%{version}.jar %{name}.jar)
 
 # Javadoc
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
@@ -91,15 +92,20 @@ cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name}
 
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -m 644 build/lib/%{name}-%{version}.pom \
-    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+install -m 644 %{SOURCE1} \
+    %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
+%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar
 
 %files
-%doc README.txt LICENSE.txt
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_datadir}/maven-metadata/%{name}.xml
+%license LICENSE.txt
+%doc README.txt
+%{_javadir}/*.jar
+%{_mavenpomdir}/*
+%if %{defined _maven_repository}
+%{_mavendepmapfragdir}/%{name}
+%else
+%{_datadir}/maven-metadata/%{name}.xml*
+%endif
 
 %files javadoc
 %doc userguide