diff --git a/annogen.spec b/annogen.spec
index 213b8f8..cf5ed2c 100644
--- a/annogen.spec
+++ b/annogen.spec
@@ -1,24 +1,21 @@
-Name:           annogen 
-Version:        0.1.0
-Release:        8%{?dist}
-Summary:        Java framework for JSR-175 annotations 
-License:        ASL 2.0
-URL:            http://annogen.codehaus.org/
+Name:          annogen 
+Version:       0.1.0
+Release:       9%{?dist}
+Summary:       Java framework for JSR-175 annotations 
+License:       ASL 2.0
+URL:           http://annogen.codehaus.org/
 # svn export http://svn.codehaus.org/annogen/annogen/tags/release-0_1_0/ annogen-0.1.0
 # find annogen-0.1.0/ -name '*.jar' -delete
 # tar cJf annogen-0.1.0-CLEAN.tar.xz annogen-0.1.0
-Source0:        %{name}-%{version}-CLEAN.tar.xz
-Source1:        http://repo1.maven.org/maven2/annogen/annogen/0.1.0/annogen-0.1.0.pom
-Patch0:         annogen-doc-build.patch
-BuildArch:      noarch
-
-BuildRequires: java-devel
+Source0:       %{name}-%{version}-CLEAN.tar.xz
+Source1:       http://repo1.maven.org/maven2/annogen/annogen/0.1.0/annogen-0.1.0.pom
+Patch0:        annogen-doc-build.patch
+BuildArch:     noarch
 BuildRequires: ant
-BuildRequires: qdox
-BuildRequires: jpackage-utils    
 BuildRequires: dos2unix
-Requires:      java-headless
-Requires:      jpackage-utils
+BuildRequires: java-devel
+BuildRequires: javapackages-local 
+BuildRequires: qdox
 Requires:      qdox
 
 %description
@@ -35,38 +32,44 @@ API documentation for %{name}.
 %prep
 %setup -q
 %patch0 -p1
+
+sed -i.tools_jar "s|/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.1.x86_64|%{_jvmdir}/java|" build-docs.xml
+
+sed -i.version "s|0.1.1|%{version}|" build.properties
+
 find examples -type f | xargs dos2unix
 find license -type f | xargs dos2unix
 find docs -name '*.html' -o -name '*.css' | xargs dos2unix
 
+sed -i.qdox2 "s|import com.thoughtworks.qdox.model.AbstractJavaEntity;|import com.thoughtworks.qdox.model.impl.AbstractJavaEntity;|" \
+ annogen/adapters/qdox/src/org/codehaus/annogen/override/QDoxElementIdPool.java \
+ annogen/adapters/qdox/src/org/codehaus/annogen/view/QDoxAnnoViewer.java
+
 %build
+
+%mvn_file %{name}:%{name} %{name}
 export CLASSPATH=$( build-classpath qdox)
 for x in *.xml; do 
   sed -i -e "s/source='1.4'/source='1.5'/; s/target='1.4'/target='1.5'/" $x;
 done
 ant jars
 ant docs
+%mvn_artifact %{SOURCE1} build/distribution/%{name}-%{version}.jar
 
 %install
-install -d -m 755 %{buildroot}%{_javadir}
-cp build/distribution/annogen-*.jar %{buildroot}%{_javadir}/%{name}.jar
-
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-cp -p %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -rp build/docs/* %{buildroot}%{_javadocdir}/%{name}/
+%mvn_install -J build/docs
 
 %files -f .mfiles
 %doc license/LICENSE.txt license/NOTICE.txt examples/
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc license/LICENSE.txt
-%{_javadocdir}/%{name}
-
 
 %changelog
+* Thu Oct 23 2014 gil cattaneo <puntogil@libero.it> 0.1.0-9
+- port to qdox 2.0
+- adapt to current guideline
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild