diff --git a/build.xml b/build.xml
index 383d10e3be6..5e46a399a64 100644
--- a/build.xml
+++ b/build.xml
@@ -534,6 +534,8 @@
 
     <solr-jar destfile="${dist}/apache-solr-cell-src-${version}.jar"
               basedir="contrib/extraction/src" />
+    <solr-jar destfile="${dist}/apache-solr-velocity-src-${version}.jar"
+              basedir="contrib/velocity/src" />
     <solr-jar destfile="${dist}/apache-solr-clustering-src-${version}.jar"
               basedir="contrib/clustering/src" />
   </target>
@@ -550,6 +552,8 @@
               basedir="${build.javadoc}/contrib-solr-dataimporthandler" />
     <solr-jar destfile="${dist}/apache-solr-clustering-docs-${version}.jar"
               basedir="${build.javadoc}/contrib-solr-clustering" />
+    <solr-jar destfile="${dist}/apache-solr-velocity-docs-${version}.jar"
+              basedir="${build.javadoc}/contrib-solr-velocity" />
     <solr-jar destfile="${dist}/apache-solr-cell-docs-${version}.jar"
               basedir="${build.javadoc}/contrib-solr-cell" />
   </target>
@@ -737,6 +741,7 @@
     <sign-maven-dependency-artifacts artifact.id="solr-lucene-snowball"/>
     <sign-maven-dependency-artifacts artifact.id="solr-lucene-spellchecker"/>
     <sign-maven-artifacts artifact.id="solr-solrj"/>
+    <sign-maven-artifacts artifact.id="solr-velocity"/>
 
     <!-- Thes are special since there are no jars, just poms -->
     <sign-artifact input.file="${maven.dist.prefix}/solr-parent/${maven_version}/solr-parent-${maven_version}.pom"/>
@@ -819,6 +824,15 @@
       <!-- TODO: MORE NEEDED HERE ONCE WE FINALIZE THE LIBS FOR CARROT -->
       <!-- end clustering specific -->
 
+      <m2-deploy pom.xml="contrib/velocity/solr-velocity-pom.xml.template"
+      jar.file="contrib/velocity/src/main/solr/lib/apache-solr-velocity-${version}.jar">
+
+        <artifact-attachments>
+          <attach file="${dist}/apache-solr-velocity-src-${version}.jar" classifier="sources"/>
+          <attach file="${dist}/apache-solr-velocity-docs-${version}.jar" classifier="javadoc"/>
+        </artifact-attachments>
+      </m2-deploy>
+
       <m2-deploy pom.xml="src/maven/solr-core-pom.xml.template"
                  jar.file="${dist}/apache-solr-core-${version}.jar">
 
diff --git a/contrib/velocity/solr-velocity-pom.xml.template b/contrib/velocity/solr-velocity-pom.xml.template
new file mode 100644
index 00000000000..8dcaf7fd279
--- /dev/null
+++ b/contrib/velocity/solr-velocity-pom.xml.template
@@ -0,0 +1,61 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "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.
+  -->
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.solr</groupId>
+    <artifactId>solr-parent</artifactId>
+    <version>@maven_version@</version>
+  </parent>
+
+  <groupId>org.apache.solr</groupId>
+  <artifactId>solr-velocity</artifactId>
+  <name>Apache Solr Velocity Extension</name>
+  <version>@maven_version@</version>
+  <description>Apache Solr Velocity Extension adds support for integrating Solr and Velocity</description>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.7.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity-tools</artifactId>
+      <version>2.0-beta3</version>
+    </dependency>
+  </dependencies>
+</project>