diff --git a/jgrapht.spec b/jgrapht.spec
index 76b2a9e..6996098 100644
--- a/jgrapht.spec
+++ b/jgrapht.spec
@@ -1,6 +1,6 @@
 Name:    jgrapht
 Version: 0.8.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: A free Java graph library that provides mathematical graph objs and algorithms
 License: LGPLv2+
 URL:     http://jgrapht.sourceforge.net/
@@ -8,9 +8,8 @@ Source0: http://downloads.sourceforge.net/project/jgrapht/JGraphT/Version%200.8.
 Patch0:  remove_uneccessary_hardcoded_classpath.patch
 
 BuildRequires: java-devel >= 1.6
-BuildRequires: jpackage-utils
+BuildRequires: javapackages-local
 BuildRequires: ant
-Requires: java-headless
 
 BuildArch: noarch
 
@@ -41,21 +40,22 @@ ant jar
 ant javadoc
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
+%mvn_artifact thirdparty:%{name}-jdk1.6:%{version} %{name}-jdk1.6.jar
+%mvn_file thirdparty:%{name}-jdk1.6 %{name}
+%mvn_install -J javadoc
 
-cp %{name}-jdk1.6.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%files -f .mfiles
+%doc README.html
+%license license-LGPL.txt
 
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%doc license-LGPL.txt README.html
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%license license-LGPL.txt
 
 %changelog
+* Tue Mar 10 2015 gil cattaneo <puntogil@libero.it> 0.8.1-10
+- Add maven metadata
+- Adapt to current guideline
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild