diff --git a/velocity-tomcat6.patch b/velocity-tomcat6.patch
new file mode 100644
index 0000000..9c706cf
--- /dev/null
+++ b/velocity-tomcat6.patch
@@ -0,0 +1,37 @@
+From 8758e3c83411ffadc084d241217fc25f1fd31f42 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Thu, 14 Oct 2010 10:20:52 +0200
+Subject: [PATCH] Fix test for servlet api 2.5
+
+---
+ .../velocity/test/VelocityServletTestCase.java     |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/src/test/org/apache/velocity/test/VelocityServletTestCase.java b/src/test/org/apache/velocity/test/VelocityServletTestCase.java
+index 824583e..ac0ab5c 100644
+--- a/src/test/org/apache/velocity/test/VelocityServletTestCase.java
++++ b/src/test/org/apache/velocity/test/VelocityServletTestCase.java
+@@ -16,7 +16,7 @@ package org.apache.velocity.test;
+  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  * KIND, either express or implied.  See the License for the
+  * specific language governing permissions and limitations
+- * under the License.    
++ * under the License.
+  */
+ 
+ import java.io.IOException;
+@@ -149,6 +149,11 @@ public class VelocityServletTestCase extends TestCase
+             return this;
+         }
+ 
++        public String getContextPath()
++        {
++            return "";
++        }
++
+         public String getServletContextName()
+         {
+             return "VelocityTestContext";
+-- 
+1.7.2.3
+
diff --git a/velocity.spec b/velocity.spec
index 0ca0c03..4e11657 100644
--- a/velocity.spec
+++ b/velocity.spec
@@ -30,7 +30,7 @@
 
 Name:           velocity
 Version:        1.6.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Java-based template engine
 License:        ASL 2.0
@@ -40,13 +40,14 @@ Patch0:		velocity-remove-avalon-logkit.patch
 Patch1:		velocity-use-system-jars.patch
 Patch2:		velocity-servletapi5.patch
 Patch3:		velocity-cleanup-pom.patch
+Patch4:         velocity-tomcat6.patch
 URL:            http://velocity.apache.org/
 Group:          Development/Libraries
-Requires:       jakarta-commons-collections
+Requires:       apache-commons-collections
 Requires:       apache-commons-logging
 Requires:       apache-commons-lang
 # Use servletapi5 instead of servletapi3
-Requires:       servletapi5
+Requires:       tomcat6-servlet-2.5-api
 Requires:       oro
 # We need a version of werken-xpath with a POM
 Requires:	werken-xpath >= 0.9.4-5.beta.12.3
@@ -64,11 +65,10 @@ BuildRequires:  antlr
 BuildRequires:  junit
 BuildRequires:	ant-junit
 BuildRequires:  hsqldb
-BuildRequires:  jakarta-commons-collections
+BuildRequires:  apache-commons-collections
 BuildRequires:  apache-commons-logging
 BuildRequires:  apache-commons-lang
-# Use servletapi5 instead of servletapi3
-BuildRequires:  servletapi5
+BuildRequires:  tomcat6-servlet-2.5-api
 BuildRequires:  oro
 BuildRequires:  jdom >= 0:1.0-1
 BuildRequires:  bcel
@@ -144,15 +144,18 @@ rm -f src/java/org/apache/velocity/runtime/log/VelocityFormatter.java
 cp %{SOURCE1} ./pom.xml
 %patch3 -p1
 
+# fix test for servlet api 2.5
+%patch4 -p1
+
 # -----------------------------------------------------------------------------
 
 %build
 export CLASSPATH=$(build-classpath \
 antlr \
-jakarta-commons-collections \
+apache-commons-collections \
 commons-lang \
 commons-logging \
-servletapi5 \
+tomcat6-servlet-2.5-api \
 junit \
 oro \
 log4j \
@@ -222,6 +225,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 
 %changelog
+* Thu Oct 14 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.3-5
+- Use apache-commons-collections instead of jakarta name
+- Use tomcat6 for dependency instead of tomcat5 (bz#640660)
+
 * Mon Jun 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.6.3-4
 - Fix BR/R for jakarta-commons-rename.
 
@@ -354,7 +361,7 @@ rm -rf $RPM_BUILD_ROOT
 - Run JUnit regression tests as part of the build process
 - Added patch file to fix test case classpath for JUnit standard locations
 
-* Mon May 06 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.3-0.rc1.1jpp 
+* Mon May 06 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.3-0.rc1.1jpp
 - 1.3.0rc1
 - dropped patch
 - versioned dir for javadoc