diff --git a/jdom2.spec b/jdom2.spec
index d13af73..d893d1e 100644
--- a/jdom2.spec
+++ b/jdom2.spec
@@ -1,6 +1,6 @@
 Name:          jdom2
-Version:       2.0.5
-Release:       4%{?dist}
+Version:       2.0.6
+Release:       1%{?dist}
 Summary:       Java manipulation of XML made easy
 License:       ASL 1.1 or BSD
 URL:           http://www.jdom.org/
@@ -12,13 +12,10 @@ Source2:       jdom-junit-template.pom
 # Disable gpg signatures
 # Process contrib and junit pom files
 Patch0:        jdom-2.0.5-build.patch
-# Resolve conflict with java8
-# make JDOM sort methods public
-Patch1:        jdom-2.0.5-java8.patch
 
 BuildRequires: java-devel
 BuildRequires: java-javadoc
-BuildRequires: jpackage-utils
+BuildRequires: javapackages-local
 BuildRequires: ant
 BuildRequires: ant-junit
 BuildRequires: bea-stax-api
@@ -33,12 +30,6 @@ BuildRequires: xml-commons-apis
 #BuildRequires: log4j12
 #BuildRequires: objectweb-asm3
 
-Requires:      jpackage-utils
-
-Requires:      jaxen
-Requires:      xalan-j2
-Requires:      xerces-j2
-
 BuildArch:     noarch
 
 %description
@@ -66,7 +57,6 @@ find . -name "*.jar" -print -delete
 %patch0 -p0
 #sed -i.asm "s|%{_javadir}/objectweb-asm|%{_javadir}/objectweb-asm3|" build.xml
 #sed -i.log4j "s|log4j.jar|log4j12-1.2.17.jar|" build.xml
-%patch1 -p1
 
 cp -p %{SOURCE1} maven/contrib.pom
 cp -p %{SOURCE2} maven/junit.pom
@@ -81,33 +71,22 @@ sed -i.coverage "s|coverage, jars|jars|" build.xml
 ant -Dversion=%{version} -Dj2se.apidoc=%{_javadocdir}/java maven
 
 %install
-
-mkdir -p %{buildroot}%{_javadir}/%{name}
-install -m 644 build/package/jdom-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
-install -m 644 build/package/jdom-%{version}-contrib.jar %{buildroot}%{_javadir}/%{name}/%{name}-contrib.jar
-install -m 644 build/package/jdom-%{version}-junit.jar %{buildroot}%{_javadir}/%{name}/%{name}-junit.jar
-
-# Not required process as compat package: aId is jdom2 by default
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 build/maven/core/%{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%add_maven_depmap JPP.%{name}-%{name}.pom %{name}/%{name}.jar
-install -pm 644 build/maven/core/%{name}-%{version}-contrib.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-contrib.pom
-%add_maven_depmap JPP.%{name}-%{name}-contrib.pom %{name}/%{name}-contrib.jar
-install -pm 644 build/maven/core/%{name}-%{version}-junit.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-junit.pom
-%add_maven_depmap JPP.%{name}-%{name}-junit.pom %{name}/%{name}-junit.jar
-
-mkdir -p %{buildroot}%{_javadocdir}
-cp -rp build/apidocs %{buildroot}%{_javadocdir}/%{name}
+%mvn_artifact build/maven/core/%{name}-%{version}.pom build/package/jdom-%{version}.jar
+%mvn_artifact build/maven/core/%{name}-%{version}-contrib.pom build/package/jdom-%{version}-contrib.jar
+%mvn_artifact build/maven/core/%{name}-%{version}-junit.pom build/package/jdom-%{version}-junit.jar
+%mvn_install -J build/apidocs
 
 %files -f .mfiles
 %dir %{_javadir}/%{name}
 %doc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
 
 %changelog
+* Tue Oct 21 2014 gil cattaneo <puntogil@libero.it> 2.0.6-1
+- update to 2.0.6 (rhbz#1118627)
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild