diff --git a/avalon-logkit-2.1.pom b/avalon-logkit-2.1.pom
new file mode 100644
index 0000000..09cefd6
--- /dev/null
+++ b/avalon-logkit-2.1.pom
@@ -0,0 +1,31 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>avalon-logkit</groupId>
+  <artifactId>avalon-logkit</artifactId>
+  <name>Avalon Logkit</name>
+  <version>2.1</version>
+  <description>Log4j-like logging toolkit.</description>
+  <inceptionYear>1997</inceptionYear>
+  <dependencies>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.11</version>
+    </dependency>
+    <dependency>
+      <groupId>servletapi</groupId>
+      <artifactId>servletapi</artifactId>
+      <version>2.3</version>
+    </dependency>
+    <dependency>
+      <groupId>geronimo-spec</groupId>
+      <artifactId>geronimo-spec-javamail</artifactId>
+      <version>1.3.1-rc3</version>
+    </dependency>
+    <dependency>
+      <groupId>geronimo-spec</groupId>
+      <artifactId>geronimo-spec-jms</artifactId>
+      <version>1.1-rc4</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index e007735..1062b5a 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -40,11 +40,16 @@ License:     ASL 1.1
 Group:       Development/Libraries
 URL:         http://avalon.apache.org/%{short_name}/
 Source0:     http://www.apache.org/dist/excalibur/%{name}/source/%{name}-%{version}-src.zip
+Source1:     http://repo1.maven.org/maven2/avalon-logkit/avalon-logkit/%{version}/%{name}-%{version}.pom
 Patch0:      fix-java6-compile.patch
 Requires:    avalon-framework >= 0:4.1.4
 Requires:    servlet25
 Requires:    jms
 Requires:    jdbc-stdext
+
+Requires(post):    jpackage-utils
+Requires(postun):  jpackage-utils
+
 BuildRequires:    jpackage-utils >= 0:1.5
 BuildRequires:    ant
 BuildRequires:    javamail
@@ -54,8 +59,8 @@ BuildRequires:    avalon-framework >= 0:4.1.4
 BuildRequires:    servlet25
 BuildRequires:    jms
 BuildRequires:    jdbc-stdext
+
 BuildArch:    noarch
-BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %description
@@ -72,7 +77,7 @@ Requires:     jpackage-utils
 Javadoc for %{name}.
 
 %prep
-%setup -q 
+%setup -q
 %patch0
 
 # remove all binary libs
@@ -83,32 +88,52 @@ export CLASSPATH=%(build-classpath log4j javamail/mailapi jms tomcat6-servlet-2.
 ant -Dnoget=true clean jar javadoc
 
 %install
-rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
+install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
+
+install -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+
+# compatibility depmaps
+%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{name}
+%add_to_maven_depmap org.apache.avalon.logkit %{name} %{version} JPP %{name}
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt
-%{_javadir}/*
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_javadir}/%{name}.jar
 
 %files javadoc
 %defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Thu Apr 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.1-3
+- Add maven metadata into package
+- Tweaks according to new guidelines
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -160,18 +185,18 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Mar 21 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> 1.2-1jpp
 - For jpackage-utils 1.5
 
-* Tue May 07 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.0.1-4jpp 
+* Tue May 07 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.0.1-4jpp
 - hardcoded distribution and vendor tag
 - group tag again
 
-* Thu May 2 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.0.1-3jpp 
+* Thu May 2 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.0.1-3jpp
 - distribution tag
 - group tag
 
-* Mon Mar 18 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.0.1-2jpp 
+* Mon Mar 18 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.0.1-2jpp
 - generic servlet support
 
-* Sun Feb 03 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.0.1-1jpp 
+* Sun Feb 03 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.0.1-1jpp
 - 1.0.1
 - versioned dir for javadoc
 - no dependencies for and javadoc package