diff --git a/velocity.spec b/velocity.spec
index e03392e..a88ec98 100644
--- a/velocity.spec
+++ b/velocity.spec
@@ -30,7 +30,7 @@
 
 Name:           velocity
 Version:        1.6.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Java-based template engine
 License:        ASL 2.0
@@ -76,7 +76,6 @@ BuildRequires:  jpackage-utils
 # It fails one of the arithmetic test cases with gcj
 BuildRequires:	java-devel >= 1:1.6.0
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
 Velocity is a Java-based template engine. It permits anyone to use the
@@ -186,7 +185,6 @@ install -p -m 644 bin/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}
-rm -rf docs/api
 
 # data
 install -d -m 755 %{buildroot}%{_datadir}/%{name}
@@ -195,6 +193,7 @@ cp -pr convert examples test %{buildroot}%{_datadir}/%{name}
 # Maven metadata
 install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %add_to_maven_depmap org.apache.velocity %{name} %{version} JPP %{name}
+%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
 
 # -----------------------------------------------------------------------------
 
@@ -204,9 +203,6 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 # -----------------------------------------------------------------------------
 
 %files
@@ -232,6 +228,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Fri Dec 17 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.4-2
+- Add compatibility depmap
+
 * Wed Nov  3 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.4-1
 - Rebase to latest upstream
 - Fix problems from bz#226525