diff --git a/saxon6.changes b/saxon6.changes
index d4cba90..4925743 100644
--- a/saxon6.changes
+++ b/saxon6.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Nov 19 06:37:45 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Add the maven metadata in order to be usable in maven build
+
+-------------------------------------------------------------------
+Wed Nov 18 04:25:55 UTC 2020 - Anton Shvetz <tz@sectorb.msk.ru>
+
+- Remove "fop" subpackage because it provides an empty JAR.
+  Source files do not contain any FOP support.
+
 -------------------------------------------------------------------
 Mon Sep 18 17:51:41 UTC 2017 - fstrba@suse.com
 
diff --git a/saxon6.spec b/saxon6.spec
index 0cf03a9..b2f7e99 100644
--- a/saxon6.spec
+++ b/saxon6.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package saxon6
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,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:        The SAXON XSLT Processor from Michael Kay
 License:        MPL-1.0
 Group:          Productivity/Publishing/XML
-Url:            http://saxon.sourceforge.net/
+URL:            http://saxon.sourceforge.net/
 Source0:        http://download.sf.net/saxon/saxon6-5-5.zip
 Source1:        %{name}.saxon.script
 Source2:        %{name}.build.script
@@ -41,9 +41,8 @@ Patch4:         saxon-add-fixes-from-com-isl-saxon-aelfred.patch
 Patch5:         saxon6-batch.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  fop >= 0.20.1
 BuildRequires:  java-devel
-BuildRequires:  javapackages-tools
+BuildRequires:  javapackages-local
 BuildRequires:  jdom >= 1.0
 BuildRequires:  unzip
 BuildRequires:  xml-commons-apis
@@ -51,6 +50,7 @@ Requires:       %{_sbindir}/update-alternatives
 Requires:       jaxp_parser_impl
 Provides:       jaxp_transform_impl = %{name}-%{version}
 Provides:       saxon
+Obsoletes:      %{name}-fop
 BuildArch:      noarch
 
 %description
@@ -110,16 +110,6 @@ Requires:       %{name} = %{version}-%{release}
 %description    demo
 Demonstrations and samples for %{name}.
 
-%package        fop
-Summary:        FOP support for %{name}
-Group:          Productivity/Publishing/XML
-Requires:       %{name} = %{version}-%{release}
-Requires:       fop >= 0.20.1
-Provides:       saxon-fop
-
-%description    fop
-FOP support for %{name}.
-
 %package        jdom
 Summary:        JDOM support for %{name}
 Group:          Productivity/Publishing/XML
@@ -155,20 +145,21 @@ rm -rf *.jar docs/api
 %build
 # fixes the javadoc fail
 export LC_ALL=en_US.ISO-8859-2
-export CLASSPATH=%(build-classpath xml-commons-apis xmlgraphics-fop jdom)
+export CLASSPATH=%(build-classpath xml-commons-apis jdom)
 ant \
   -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
   -Dj2se.javadoc=%{_javadocdir}/java \
-  -Dfop.javadoc=%{_javadocdir}/fop \
   -Djdom.javadoc=%{_javadocdir}/jdom
 
 %install
 # jars
 mkdir -p %{buildroot}%{_javadir}
 cp -p build/lib/saxon.jar %{buildroot}%{_javadir}/%{name}.jar
+%add_maven_depmap saxon:saxon:%{version} %{name}.jar
 cp -p build/lib/saxon-aelfred.jar %{buildroot}%{_javadir}/%{name}-aelfred.jar
-cp -p build/lib/saxon-fop.jar %{buildroot}%{_javadir}/%{name}-fop.jar
+%add_maven_depmap saxon:saxon-aelfred:%{version} %{name}-aelfred.jar -f aelfred
 cp -p build/lib/saxon-jdom.jar %{buildroot}%{_javadir}/%{name}-jdom.jar
+%add_maven_depmap saxon:saxon-jdom:%{version} %{name}-jdom.jar -f jdom
 
 # javadoc
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
@@ -203,20 +194,14 @@ if [ $1 -eq 0 ] ; then
   update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar
 fi
 
-%files
-%{_javadir}/%{name}.jar
+%files -f .mfiles
 %{_javadir}/%{name}.jar
 %{_javadir}/jaxp_transform_impl.jar
 %ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar
 
-%files aelfred
-%{_javadir}/%{name}-aelfred*
+%files aelfred -f .mfiles-aelfred
 
-%files fop
-%{_javadir}/%{name}-fop*
-
-%files jdom
-%{_javadir}/%{name}-jdom*
+%files jdom -f .mfiles-jdom
 
 %files manual
 %doc doc/*.html