diff --git a/apache-commons-math.changes b/apache-commons-math.changes
index f525db0..87522ef 100644
--- a/apache-commons-math.changes
+++ b/apache-commons-math.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 11 11:22:34 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Add alias to the maven artifact
+- Clean-up the spec file
+
 -------------------------------------------------------------------
 Tue May 15 12:56:51 UTC 2018 - fstrba@suse.com
 
diff --git a/apache-commons-math.spec b/apache-commons-math.spec
index 26dcc03..eda3e45 100644
--- a/apache-commons-math.spec
+++ b/apache-commons-math.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-math
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # 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,19 +23,13 @@ Version:        3.6.1
 Release:        0
 Summary:        The Apache Commons Mathematics Library
 License:        Apache-2.0
-Group:          Development/Libraries/Java
-Url:            http://commons.apache.org/%{base_name}/
+URL:            http://commons.apache.org/%{base_name}/
 Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}3-%{version}-src.tar.gz
 Patch0:         commons-math3-3.6.1-notests.patch
 BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
-BuildRequires:  javapackages-tools
-BuildRequires:  junit
-Requires:       java >= 1.8
-Provides:       java(commons-math3:commons-math3) = %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
@@ -45,7 +39,6 @@ the Java programming language or Commons Lang.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Libraries/Java
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -60,34 +53,29 @@ ant -Dant.build.javac.source=8 -Dcompile.source=8 \
     -Dant.build.javac.target=8 -Dcompile.target=8 \
     -Dmaven.mode.offline=true -Dmaven.test.skip=true \
     -lib %{_datadir}/java -Dbuild.sysclasspath=first \
-	jar javadoc 
+    jar javadoc
 
 %install
 # jars
-install -Dpm 644 target/%{short_name}*.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|apache-||g"`; done)
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+install -Dpm 644 target/%{short_name}*.jar %{buildroot}%{_javadir}/%{short_name}.jar
+ln -sf %{_javadir}/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
+%add_maven_depmap %{short_name}.pom %{short_name}.jar -a %{short_name}:%{short_name}
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/apidocs/ %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/apidocs/ %{buildroot}%{_javadocdir}/%{name}
 
-%files
-%defattr(-,root,root)
-%doc LICENSE.txt license-header.txt NOTICE.txt RELEASE-NOTES.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_datadir}/maven-metadata/%{name}.xml
+%files -f .mfiles
+%license LICENSE.txt license-header.txt NOTICE.txt
+%doc RELEASE-NOTES.txt
+%{_javadir}/%{name}.jar
 
 %files javadoc
-%defattr(-,root,root)
-%doc LICENSE.txt
-%{_javadocdir}/*
+%license LICENSE.txt
+%{_javadocdir}/%{name}
 
 %changelog