diff --git a/jdepend.spec b/jdepend.spec
index 202bf33..5053bd5 100644
--- a/jdepend.spec
+++ b/jdepend.spec
@@ -30,23 +30,19 @@
 
 Name:           jdepend
 Version:        2.9.1
-Release:        14%{?dist}
+Release:        15%{?dist}
 Epoch:          0
 Summary:        Java Design Quality Metrics
 License:        BSD
 URL:            http://www.clarkware.com/
-Group:          Development/Libraries
 #Downloaded from http://github.com/clarkware/jdepend/tarball/2.9.1
 Source0:        clarkware-jdepend-5798059.tar.gz
 Source1:        %{name}-%{version}.pom
 BuildArch:      noarch
 
-Requires:      java-headless
-Requires:      jpackage-utils
-
-BuildRequires: ant
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
+BuildRequires:  ant
+BuildRequires:  java-devel
+BuildRequires:  javapackages-local
 
 %description
 JDepend traverses a set of Java class and source file directories and
@@ -56,17 +52,14 @@ extensibility, reusability, and maintainability to effectively manage
 and control package dependencies.
 
 %package javadoc
-Summary:    Javadoc for %{name}
-Group:      Documentation
-Requires:   %{name} = %{version}-%{release}
+Summary:        Javadoc for %{name}
 
 %description javadoc
 Javadoc for %{name}.
 
 %package demo
-Summary:    Demos for %{name}
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
+Summary:        Demos for %{name}
+Requires:       %{name} = %{version}-%{release}
 
 %description demo
 Demonstrations and samples for %{name}.
@@ -74,42 +67,38 @@ Demonstrations and samples for %{name}.
 %prep
 %setup -q -n clarkware-jdepend-5798059
 # remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
+find . -name "*.jar" -delete
 # fix strange permissions
 find . -type d -exec chmod 755 {} \;
 
+%mvn_file %{name}:%{name} %{name}
+
 %build
 ant jar javadoc
 
 %install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
+%mvn_artifact %{SOURCE1} dist/%{name}-%{version}.jar
+%mvn_install -J build/docs/api
 rm -rf build/docs/api
 # demo
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr sample $RPM_BUILD_ROOT%{_datadir}/%{name}
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-# depmap
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files -f .mfiles
-%doc README LICENSE docs
+%doc README docs
+%license LICENSE
 
-%files javadoc
-%{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%license LICENSE
 
 %files demo
 %{_datadir}/%{name}
 
 %changelog
+* Sun Feb 14 2016 gil cattaneo <puntogil@libero.it> 0:2.9.1-15
+- adapt to current guideline
+- introduce license macro
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.9.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild