diff --git a/trilead-ssh2.changes b/trilead-ssh2.changes
index 89d3760..318e820 100644
--- a/trilead-ssh2.changes
+++ b/trilead-ssh2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 16 08:15:30 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Fix the license tag and clean up the spec file a bit
+
 -------------------------------------------------------------------
 Wed Oct 24 15:15:41 UTC 2018 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/trilead-ssh2.spec b/trilead-ssh2.spec
index bd64f84..5ed2088 100644
--- a/trilead-ssh2.spec
+++ b/trilead-ssh2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package trilead-ssh2
 #
-# 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
@@ -22,13 +22,13 @@ Name:           trilead-ssh2
 Version:        %{buildver}.%{patchlvl}
 Release:        0
 Summary:        SSH-2 protocol implementation in pure Java
-License:        BSD AND MIT
+License:        BSD-3-Clause AND MIT
+Group:          Development/Libraries/Java
 URL:            https://github.com/jenkinsci/trilead-ssh2
 Source0:        https://github.com/jenkinsci/%{name}/archive/%{name}-build%{buildver}-jenkins-%{patchlvl}.tar.gz
 BuildRequires:  fdupes
 BuildRequires:  java-devel
 BuildRequires:  javapackages-local
-BuildRequires:  javapackages-tools
 BuildArch:      noarch
 
 %description
@@ -41,6 +41,7 @@ crypto functionality is included.
 
 %package javadoc
 Summary:        Javadoc for %{name}
+Group:          Documentation/HTML
 
 %description javadoc
 API documentation for %{name}.
@@ -58,29 +59,21 @@ javadoc -d build/docs -source 6  $(find src -name \*.java | xargs)
 %install
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/
-(cd %{buildroot}%{_javadir} && ln -s %{name}-%{version}.jar %{name}.jar)
+install -m 644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
-%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar -a "org.tmatesoft.svnkit:trilead-ssh2","com.trilead:trilead-ssh2"
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar -a "org.tmatesoft.svnkit:trilead-ssh2","com.trilead:trilead-ssh2"
 
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -aL build/docs/* %{buildroot}%{_javadocdir}/%{name}
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
-%files
+%files -f .mfiles
 %license LICENSE.txt
 %doc HISTORY.txt README.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml*
-%endif
 
 %files javadoc
 %license LICENSE.txt