diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index c865b3c..827a860 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        1.4
-Release:        2
+Release:        3
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -9,8 +9,6 @@ License:        ASL 2.0
 URL:            http://xmlgraphics.apache.org/
 Source0:        http://apache.skknet.net/xmlgraphics/commons/source/%{name}-%{version}-src.tar.gz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.6
@@ -19,16 +17,18 @@ BuildRequires:  ant-junit >= 0:1.6
 BuildRequires:  junit
 BuildRequires:  apache-commons-io >= 0:1.1
 BuildRequires:  apache-commons-logging >= 0:1.0.4
-Requires:	    apache-commons-logging >= 0:1.0.4
+Requires:       apache-commons-logging >= 0:1.0.4
 Requires:       apache-commons-io >= 0:1.1
+Requires(post):   jpackage-utils
+Requires(postun): jpackage-utils
 
 %description
-Apache XML Graphics Commons is a library that consists of 
-several reusable components used by Apache Batik and 
-Apache FOP. Many of these components can easily be used 
-separately outside the domains of SVG and XSL-FO. You will 
-find components such as a PDF library, an RTF library, 
-Graphics2D implementations that let you generate PDF & 
+Apache XML Graphics Commons is a library that consists of
+several reusable components used by Apache Batik and
+Apache FOP. Many of these components can easily be used
+separately outside the domains of SVG and XSL-FO. You will
+find components such as a PDF library, an RTF library,
+Graphics2D implementations that let you generate PDF &
 PostScript files, and much more.
 
 %package        javadoc
@@ -44,6 +44,10 @@ Requires:       jpackage-utils
 %setup -q %{name}-%{version}
 rm -f `find . -name "*.jar"`
 
+# create pom from template
+sed "s:@version@:%{version}:g" %{name}-pom-template.pom \
+    > %{name}.pom
+
 
 %build
 export CLASSPATH=$(build-classpath commons-logging)
@@ -54,28 +58,37 @@ popd
 ant package javadocs
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -Dpm 0644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -Dpm 0644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -pm 644 %{name}.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+%add_to_maven_depmap org.apache.xmlgraphics %{name} %{version} JPP %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE NOTICE README
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP-%{name}.pom
 %{_javadir}/*.jar
 
 %files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
+%doc LICENSE NOTICE
 %doc %{_javadocdir}/%{name}
 
 
 %changelog
+* Tue May  3 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-3
+- Install maven metadata
+- Versionless jars & javadocs
+- Fixes according to new guidelines
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild