diff --git a/.cvsignore b/.cvsignore
index 0f4840a..a46cd8f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1 @@
-velocity-1.4-RHCLEAN.tar.bz2
-velocity-1.4
-noarch
-*.src.rpm
-velocity-1.4.tar.gz
+velocity-1.6.3.tar.gz
diff --git a/sources b/sources
index 4ff8d93..8e664d8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-61f3efdd490b01206b3c3377a86e4005  velocity-1.4-RHCLEAN.tar.bz2
-f280fee7ddb5eac5b354f6dea39a2f51  velocity-1.4.tar.gz
+5fee48e193cbc471c9a496c87ab06b9e  velocity-1.6.3.tar.gz
diff --git a/velocity-cleanup-pom.patch b/velocity-cleanup-pom.patch
new file mode 100644
index 0000000..ba46839
--- /dev/null
+++ b/velocity-cleanup-pom.patch
@@ -0,0 +1,28 @@
+--- velocity-1.6.3/pom.xml.orig	2010-01-15 14:35:23.193906857 +0000
++++ velocity-1.6.3/pom.xml	2010-01-15 14:36:41.767906266 +0000
+@@ -25,12 +25,6 @@
+ 
+   <modelVersion>4.0.0</modelVersion>
+ 
+-  <parent>
+-    <groupId>org.apache</groupId>
+-    <artifactId>apache</artifactId>
+-    <version>4</version>
+-  </parent>
+-
+   <groupId>org.apache.velocity</groupId>
+   <artifactId>velocity</artifactId>
+   <version>1.6.3</version>
+@@ -196,12 +190,6 @@
+       <scope>provided</scope>
+     </dependency>
+     <dependency>
+-      <groupId>logkit</groupId>
+-      <artifactId>logkit</artifactId>
+-      <version>2.0</version>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+       <groupId>ant</groupId>
+       <artifactId>ant</artifactId>
+       <version>1.6</version>
diff --git a/velocity-legacy-tests.patch b/velocity-legacy-tests.patch
new file mode 100644
index 0000000..98443ce
--- /dev/null
+++ b/velocity-legacy-tests.patch
@@ -0,0 +1,15 @@
+--- velocity-1.6.3.mef/build/testcases.xml.orig	2010-01-15 13:09:06.265907075 +0000
++++ velocity-1.6.3.mef/build/testcases.xml	2010-01-15 13:09:08.356067618 +0000
+@@ -36,12 +36,6 @@
+ 
+   <!-- Build classpath -->
+   <path id="velocity.test.classpath">
+-    <fileset dir="${build.lib}">
+-      <include name="**/*.jar"/>
+-    </fileset>
+-    <fileset dir="${build.test.lib}">
+-      <include name="**/*.jar"/>
+-    </fileset>
+     <pathelement location="${build.dest}"/>
+     <pathelement location="${build.test.dest}"/>
+   </path>
diff --git a/velocity-remove-avalon-logkit.patch b/velocity-remove-avalon-logkit.patch
new file mode 100644
index 0000000..c4e3651
--- /dev/null
+++ b/velocity-remove-avalon-logkit.patch
@@ -0,0 +1,31 @@
+diff -ur velocity-1.6.3/src/java/org/apache/velocity/runtime/defaults/velocity.properties velocity-1.6.3.mef/src/java/org/apache/velocity/runtime/defaults/velocity.properties
+--- velocity-1.6.3/src/java/org/apache/velocity/runtime/defaults/velocity.properties	2009-12-07 23:41:24.000000000 +0000
++++ velocity-1.6.3.mef/src/java/org/apache/velocity/runtime/defaults/velocity.properties	2010-01-15 12:25:51.406906108 +0000
+@@ -20,10 +20,10 @@
+ # ----------------------------------------------------------------------------
+ 
+ # ----------------------------------------------------------------------------
+-#  default LogChute to use: default: AvalonLogChute, Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute
++#  default LogChute to use: default: Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute
+ # ----------------------------------------------------------------------------
+ 
+-runtime.log.logsystem.class = org.apache.velocity.runtime.log.AvalonLogChute,org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.runtime.log.CommonsLogLogChute,org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.runtime.log.JdkLogChute
++runtime.log.logsystem.class = org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.runtime.log.CommonsLogLogChute,org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.runtime.log.JdkLogChute
+ 
+ # ---------------------------------------------------------------------------
+ # This is the location of the Velocity Runtime log.
+Only in velocity-1.6.3/src/java/org/apache/velocity/runtime/log: AvalonLogChute.java
+Only in velocity-1.6.3/src/java/org/apache/velocity/runtime/log: AvalonLogSystem.java
+diff -ur velocity-1.6.3/src/java/org/apache/velocity/runtime/log/LogManager.java velocity-1.6.3.mef/src/java/org/apache/velocity/runtime/log/LogManager.java
+--- velocity-1.6.3/src/java/org/apache/velocity/runtime/log/LogManager.java	2009-12-07 23:41:24.000000000 +0000
++++ velocity-1.6.3.mef/src/java/org/apache/velocity/runtime/log/LogManager.java	2010-01-15 12:25:51.407906304 +0000
+@@ -119,7 +119,7 @@
+          * classes, and we use the first one we find.
+          *
+          * Note that the default value of this property contains the
+-         * AvalonLogChute, the Log4JLogChute, CommonsLogLogChute,
++         * Log4JLogChute, CommonsLogLogChute,
+          * ServletLogChute, and the JdkLogChute for
+          * convenience - so we use whichever we works first.
+          */
+Only in velocity-1.6.3/src/java/org/apache/velocity/runtime/log: VelocityFormatter.java
diff --git a/velocity-use-system-jars.patch b/velocity-use-system-jars.patch
new file mode 100644
index 0000000..8ce6ba6
--- /dev/null
+++ b/velocity-use-system-jars.patch
@@ -0,0 +1,180 @@
+--- velocity-1.6.3.mef/build/build.xml.orig	2010-01-15 12:53:01.344906711 +0000
++++ velocity-1.6.3.mef/build/build.xml	2010-01-15 12:53:07.537915055 +0000
+@@ -138,28 +138,6 @@
+   <!-- =================================================================== -->
+   <!-- sets up the build environment (classpath and libs)                  -->
+   <!-- =================================================================== -->
+-  <target name="build-prepare">
+-    <ant antfile="${velocity.build.dir}/download.xml" target="build-download" />
+-
+-    <!-- Build classpath -->
+-    <path id="velocity.build.classpath">
+-      <fileset dir="${build.lib}">
+-        <include name="**/*.jar"/>
+-      </fileset>
+-    </path>
+-
+-    <!-- Test classpath, contains dependencies needed only for Testing -->
+-    <path id="velocity.test.classpath">
+-      <fileset dir="${build.test.lib}">
+-        <include name="**/*.jar"/>
+-      </fileset>
+-    </path>
+-
+-    <path id="velocity.run.classpath">
+-      <path refid="velocity.build.classpath"/>
+-      <pathelement location="${build.dir}/${final.name}.jar"/>
+-    </path>
+-  </target>
+ 
+   <!-- =================================================================== -->
+   <!-- checks for the existence/non-existence of various java features     -->
+@@ -172,12 +150,11 @@
+   <target name="prepare-jdbc" depends="check-jdbc,check-jdbc-true,check-jdbc-false"/>
+   <target name="prepare-jdk14" depends="check-jdk14,check-jdk14-true,check-jdk14-false"/>
+ 
+-  <target name="check-jdbc" depends="build-prepare">
++  <target name="check-jdbc">
+     <!--  note: check to see if required class is available.  -->
+     <!-- might be j2ee.jar, jdbc2_0-stdext.jar, or simply JDK 1.4+ -->
+     <available classname="javax.sql.DataSource"
+                property="jdbc.present">
+-      <classpath refid="velocity.build.classpath"/>
+     </available>
+   </target>
+ 
+@@ -208,10 +185,9 @@
+     </echo>
+   </target>
+ 
+-  <target name="check-jdk14" depends="build-prepare">
++  <target name="check-jdk14">
+      <available classname="java.util.logging.Logger"
+                property="jdk14.present">
+-      <classpath refid="velocity.build.classpath"/>
+     </available>
+   </target>
+ 
+@@ -246,7 +222,7 @@
+   <!-- =================================================================== -->
+   <target name="compile" depends="compile-src,compile-test"/>
+ 
+-  <target name="compile-src" depends="prepare,build-prepare,check-jdbc,check-jdk14"
++  <target name="compile-src" depends="prepare,check-jdbc,check-jdk14"
+           description="Compiles the Velocity source">
+     <javac srcdir="${build.src}"
+       destdir="${build.dest}"
+@@ -255,8 +231,7 @@
+       target="${javac.target}"
+       source="${javac.source}"
+       deprecation="${deprecation}"
+-      optimize="${optimize}"
+-      classpathref="velocity.build.classpath"/>
++      optimize="${optimize}"/>
+ 
+     <copy todir="${build.dest}" filtering="yes">
+       <fileset dir="${src.java.dir}">
+@@ -266,7 +241,7 @@
+ 
+   </target>
+ 
+-  <target name="compile-test" depends="prepare,build-prepare,compile-src"
++  <target name="compile-test" depends="prepare,compile-src"
+           description="Compiles the Velocity test classes">
+     <javac srcdir="${build.test.src}"
+       destdir="${build.test.dest}"
+@@ -277,8 +252,6 @@
+ 
+       <!-- Don't use the run classpath, build using the exploded class tree -->
+       <classpath>
+-        <path refid="velocity.build.classpath"/>
+-        <path refid="velocity.test.classpath" />
+         <pathelement location="${build.dest}"/>
+       </classpath>
+     </javac>
+@@ -503,7 +476,7 @@
+   <!-- =================================================================== -->
+   <!-- Compiles the example code                                           -->
+   <!-- =================================================================== -->
+-  <target name="examples" depends="build-prepare,jar"
++  <target name="examples"
+           description="Compiles the Velocity Example code">
+ 
+     <echo>
+@@ -527,8 +500,7 @@
+       encoding="UTF-8"
+       debug="${debug}"
+       deprecation="${deprecation}"
+-      optimize="${optimize}"
+-      classpathref="velocity.run.classpath"/>
++      optimize="${optimize}"/>
+   </target>
+ 
+   <target name="examples-clean" depends="examples-clean-anakia">
+@@ -546,7 +518,7 @@
+   <!-- =================================================================== -->
+   <!-- Creates the API documentation                                       -->
+   <!-- =================================================================== -->
+-  <target name="javadocs" depends="prepare,build-prepare"
++  <target name="javadocs" depends="prepare"
+           description="Creates the Javadoc API documentation">
+ 
+     <mkdir dir="${build.javadoc}"/>
+@@ -562,8 +534,7 @@
+              doctitle="${name} ${version} API"
+              encoding="UTF-8"
+              docencoding="UTF-8"
+-             bottom="Copyright &#169; 2000-${build.year} &lt;a href=&quot;http://www.apache.org/&quot;&gt;Apache Software Foundation&lt;/a&gt;. All Rights Reserved."
+-             classpathref="velocity.build.classpath">
++             bottom="Copyright &#169; 2000-${build.year} &lt;a href=&quot;http://www.apache.org/&quot;&gt;Apache Software Foundation&lt;/a&gt;. All Rights Reserved.">
+ 
+       <link href="${javadocs.ref.jsdk}"/>
+       <link href="http://www.jdom.org/docs/apidocs"/>
+@@ -918,12 +889,11 @@
+   <!-- Make HTML version of Velocity documentation                         -->
+   <!-- =================================================================== -->
+ 
+-  <target name="docs" depends="build-prepare,jar"
++  <target name="docs" depends="jar"
+           description="Generates the Velocity HTML documentation">
+ 
+     <taskdef name="anakia"
+-             classname="org.apache.velocity.anakia.AnakiaTask"
+-             classpathref="velocity.run.classpath"/>
++             classname="org.apache.velocity.anakia.AnakiaTask"/>
+ 
+     <echo>
+   #######################################################
+@@ -1106,7 +1076,7 @@
+   <!-- =================================================================== -->
+   <!-- JUnit Tests for Velocity                                            -->
+   <!-- =================================================================== -->
+-  <target name="test" depends="build-prepare,compile-test"
++  <target name="test" depends="compile-test"
+           description="Run the Velocity testcases">
+ 
+     <mkdir dir="${build.test.reports}"/>
+@@ -1120,8 +1090,6 @@
+ 
+       <!-- Don't use the run classpath, test using the exploded class tree -->
+       <classpath>
+-        <path refid="velocity.build.classpath" />
+-        <path refid="velocity.test.classpath" />
+         <pathelement path="${build.dest}"/>
+         <pathelement path="${build.test.dest}"/>
+       </classpath>
+--- velocity-1.6.3.mef/build/testcases.xml.orig	2010-01-15 13:09:06.265907075 +0000
++++ velocity-1.6.3.mef/build/testcases.xml	2010-01-15 13:09:08.356067618 +0000
+@@ -36,12 +36,6 @@
+ 
+   <!-- Build classpath -->
+   <path id="velocity.test.classpath">
+-    <fileset dir="${build.lib}">
+-      <include name="**/*.jar"/>
+-    </fileset>
+-    <fileset dir="${build.test.lib}">
+-      <include name="**/*.jar"/>
+-    </fileset>
+     <pathelement location="${build.dest}"/>
+     <pathelement location="${build.test.dest}"/>
+   </path>