diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec
index 862270f..95b3634 100644
--- a/apache-commons-jxpath.spec
+++ b/apache-commons-jxpath.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          1.3
-Release:          7%{?dist}
+Release:          8%{?dist}
 Summary:          Simple XPath interpreter
 
 Group:            Development/Libraries
@@ -38,11 +38,6 @@ Requires:         jdom >= 0:1.0
 Requires:         apache-commons-beanutils
 Requires:         apache-commons-logging
 
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
-
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 # This should go away with F-17
 Provides:         jakarta-%{short_name} = 0:%{version}-%{release}
 Obsoletes:        jakarta-%{short_name} < 0:%{version}-%{release}
@@ -69,68 +64,50 @@ This package contains the API documentation for %{name}.
 %patch0 -p1
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
 # we are skipping tests because we don't have com.mockrunner in repos yet
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
+        -Dmaven.local.depmap.file="%{SOURCE1}" \
         -Dmaven.test.skip=true \
         install javadoc:javadoc
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -Dpm 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -Dpm 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 pushd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}*; do
-    ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
-    ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
-    ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
-done
+    ln -sf %{name}.jar %{short_name}.jar
 popd # come back from javadir
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -sf %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # Install pom
 # pom
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
+%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name}"
 
-# following line is only for backwards compatibility. New packages
-# should use proper groupid org.apache.commons and also artifactid
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
+%pre javadoc
+# workaround for rpm bug, can be removed in F-20
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt
-%{_javadir}/*.jar
+%{_javadir}/%{name}.jar
+%{_javadir}/%{short_name}.jar
 %{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavendepmapfragdir}/*
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Mar  2 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> 1.3-8
+- Fix build and update to latest guidelines
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild