diff --git a/pom.xml b/pom.xml
index 41cab7a6e9ca..17eff889c662 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,7 +179,7 @@ pageTracker._trackPageview();
                      <docletArtifact>
                         <groupId>org.infinispan</groupId>
                         <artifactId>infinispan-tools</artifactId>
-                        <version>4.0.0-SNAPSHOT</version>
+                        <version>${project.version}</version>
                      </docletArtifact>
                      <footer>
                 &lt;!-- Google Analytics --&gt;
@@ -224,7 +224,7 @@ pageTracker._trackPageview();
                      <docletArtifact>
                         <groupId>org.infinispan</groupId>
                         <artifactId>infinispan-tools</artifactId>
-                        <version>4.0.0-SNAPSHOT</version>
+                        <version>${project.version}</version>
                      </docletArtifact>
                      <footer>
                 &lt;!-- Google Analytics --&gt;
@@ -273,4 +273,4 @@ pageTracker._trackPageview();
       </profile>
 
    </profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/query/src/main/java/org/infinispan/query/Version.java b/query/src/main/java/org/infinispan/query/Version.java
deleted file mode 100644
index e5dbe8cbbbed..000000000000
--- a/query/src/main/java/org/infinispan/query/Version.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.infinispan.query;
-
-/**
- * Spits out the version number.
- *
- * @author Navin Surtani (<a href="mailto:nsurtani@redhat.com">nsurtani@redhat.com</a>)
- */
-public class Version {
-   //version string - should correspond with the version in the pom
-   private static final String version = "1.0.0-SNAPSHOT";
-
-   public static void main(String[] args) {
-      System.out.println("\nJBoss Cache Searchable Edition\nVersion:\t" + version + "\n\n");
-   }
-}