diff --git a/xmlgraphics-fop.changes b/xmlgraphics-fop.changes
index 2308f45..7df4163 100644
--- a/xmlgraphics-fop.changes
+++ b/xmlgraphics-fop.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep  6 08:09:43 UTC 2013 - mvyskocil@suse.com
+
+- use new add_maven_depmap
+- add missing commons packages to BuildRequires
+
 -------------------------------------------------------------------
 Thu Apr 25 12:10:30 UTC 2013 - mvyskocil@suse.com
 
diff --git a/xmlgraphics-fop.keyring b/xmlgraphics-fop.keyring
new file mode 100644
index 0000000..e24105c
--- /dev/null
+++ b/xmlgraphics-fop.keyring
@@ -0,0 +1,34 @@
+pub   2048R/0ED3D317 2012-04-09 [expires: 2017-04-08]
+uid                  Glenn Adams <gadams@apache.org>
+sub   2048R/F23E86C1 2012-04-09 [expires: 2017-04-08]
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+mQENBE+DFvEBCACwHesM5hkZrlgPiq588FbZPe7QGtDRVdh0YbgI2A4Ky2odbFmA
+/n7lF9v+yf+FUn/0H2igwDYqLFx4JsB7z+Nvj+hwExdGQxuDaGSwMjjpJeEiuEmf
+b1Er5KYgpeFNm1MVP+r5kW5962O+HGIEx1xQ85AskNbr/jQkAg/wbbwWLFBQRMER
+PqFs1rXL2aWip8XtNPKnKBLPlFPn9a7glgB5Whgbls44KpR0dplAVoCWMnZEYnTA
+JYITcaDTCGFQI7aYgbj986RpS80o/Wcsnb8rjHKRZG8TaDr9MbgmmK39KwiJCflJ
+9LvXR9g1j3addxgqEUuQBEtoLkWs/eDT/KQ7ABEBAAG0H0dsZW5uIEFkYW1zIDxn
+YWRhbXNAYXBhY2hlLm9yZz6JAT4EEwECACgFAk+DFvECGwMFCQlmAYAGCwkIBwMC
+BhUIAgkKCwQWAgMBAh4BAheAAAoJEGZUur4O09MXl7MH/jfeyE012/ABTTjvwvRw
+2evD3cfghrZOQVT3PVEcVnXIcnVlmznO2DDs8aWXlhJ94ZnNdw8iKE8weK1FGXdd
+qWA7vHrOI1UAo7h+CDaBt0TM6OEM3Mp3+5baOJMRXyrjhbv74sj88HYRtoPhA2+z
+5ilVNmmX4PEAc6wqt87ZfNQ2ZqX2YzR+OaT5OggSB12qU/uE7d4d0NcDozEKQFUP
+CMAuPJRNd4/J5yFy0DStfgsDKuUTir0oldlUElAjbhF8WtAgRwufIYuG/r4Cbuid
+Qc32yVAoy069ZcggwBpkzVPOpL2by1fzeSohjIkntDIL474KuSSoBKCuw2nYxpyw
+b0O5AQ0ET4MW8QEIAMFUAScm2Dw1fmBhmKMVc0mzqpR8TvSQvwJLiXRSP86NI1zc
+DtuiXCFfNZykOifFk50otMH1hd91hqeQ6HfsxxYtXLg2UDHG2gTKzlWefwA+1eFc
+M8fz/oV0CanGjqaOd6VZoYeg+LSD6YgrJZVjuoxNN/S0A9fNd8B3CXsG+92udkkW
+YMyiUpD5qjMEwcjmj6ITX3M9VLxDCKKhYwN+u5wokuAk3yKtvBpWhJDQbaJcuDaC
+rLH788gFybZDzyJ8Ug/95peV9Z57OCjMJLtn67ES7fB544EQRYVmDGnX5tTo9sYj
+0bDjlbKX9lqS1sCGSezPxYxGgeXlnQrt+Sm+gd0AEQEAAYkBJQQYAQIADwUCT4MW
+8QIbDAUJCWYBgAAKCRBmVLq+DtPTF2YbB/0Vo8Xr9N1adqlY1UAofvo5AoXZFxFJ
+jkB0Eb3z1V3iSBh8P921LD0gUQz6JXptXZPVGnwgm/44RdqXC+kX+4MxiVBtNAHp
+0ODjIXiabBrixAHnT7EcAJkWue0RP2J5wiYKklwWFbEetjl0QSmitz8Jh33eA76j
+kFYW+vgKUMA8UrJ6j2Hk+vMFi0Odtntbc7AXvLifSPSmSztNe/Mws69EbuBph6bQ
++zSmTQ6nt8PX+v3e0PnkXdGD8si9H6hj0K32pEMz86ttSnAtrhvsAdKPYOkY7/JD
+0Bl+bnb7FLxJjJGlGuO/Rn5SIR3fFNQGrE/zl2wsKtftUXse6kkZSue+
+=XDBB
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec
index 83dada4..5c4c38b 100644
--- a/xmlgraphics-fop.spec
+++ b/xmlgraphics-fop.spec
@@ -41,14 +41,15 @@ Source10:       %{name}.xml
 Source11:       %{name}-fontmetrics.xml
 Source12:       %{name}-fontlist.xml
 Source1000:     http://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-1.1-src.tar.gz.asc
+Source1001:     xmlgraphics-fop.keyring
 Patch1:         xmlgraphics-fop-cli.patch
 Patch2:         xmlgraphics-fop-xconf.patch
 Url:            http://xmlgraphics.apache.org/fop/
 Requires(post):    jpackage-utils >= 1.7.4
 Requires(postun):  jpackage-utils >= 1.7.4
+Requires:       apache-commons-io >= 2.4
+Requires:       apache-commons-logging
 Requires:       avalon-framework
-Requires:       commons-io >= 2.4
-Requires:       commons-logging
 Requires:       java >= 1.6.0
 Requires:       jpackage-utils >= 1.7.4
 Requires:       xml-commons-jaxp-1.3-apis
@@ -57,8 +58,11 @@ Requires:       xmlgraphics-commons >= 1.5
 BuildRequires:  ant >= 1.6.5
 BuildRequires:  ant-junit
 BuildRequires:  ant-trax
+BuildRequires:  apache-commons-io >= 2.4
+BuildRequires:  apache-commons-logging
 BuildRequires:  avalon-framework
 BuildRequires:  docbook-xsl-stylesheets
+BuildRequires:  gpg-offline
 BuildRequires:  gpg2
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  java-javadoc
@@ -96,6 +100,7 @@ API documentation for %{name} automatically extracted from comments in source fi
 
 
 %prep
+%gpg_verify %{SOURCE1000}
 %setup -q -n %{bname}-%{version} -a5 
 ln -thyph offo-hyphenation/hyph/*.xml
 find -name "*.jar" | xargs -t rm
@@ -159,11 +164,11 @@ done
 # jars
 mkdir -p %{buildroot}%{_javadir}
 install -m 644 build/%{bname}.jar %{buildroot}%{_javadir}/%{name}.jar
-%add_to_maven_depmap org.apache.xmlgraphics %{bname} %{version} JPP %{name}
 
 # pom
-install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
-install -pm 644 build/maven/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 build/maven/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
 
 # script
 mkdir -p %{buildroot}%{_bindir}
@@ -199,15 +204,6 @@ for m in *.1.gz; do
 done
 popd 
 
-%clean
-rm -rf %{buildroot}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %defattr(0644,root,root,0755)
 %doc NOTICE LICENSE README known-issues.xml status.xml
@@ -221,7 +217,7 @@ rm -rf %{buildroot}
 %attr(0755,root,root) %{_bindir}/%{bname}-fontlist
 %{_javadir}/%{name}.jar
 %{_datadir}/%{name}
-%{_datadir}/maven2/*
+%{_mavenpomdir}/*
 %config %{_mavendepmapfragdir}/*
 %{_mandir}/man1/*
 %config(noreplace) /etc/fop.xconf