diff --git a/pom.xml b/pom.xml
index d6ea76f1e..f91df171a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,8 @@
   <name>checkstyle</name>
   <url>http://checkstyle.sourceforge.net/</url>
   <issueManagement>
-  	<system>SourceForge</system>
-  	<url>http://sourceforge.net/tracker/?group_id=29721</url>
+    <system>SourceForge</system>
+    <url>http://sourceforge.net/tracker/?group_id=29721</url>
   </issueManagement>
   <inceptionYear>2001</inceptionYear>
 
@@ -40,35 +40,35 @@
     <developer>
       <id>lkuehne</id>
       <name>Lars Kühne</name>
-      <roles>   
+      <roles>
         <role>developer</role>
       </roles>
     </developer>
     <developer>
       <id>rickgiles</id>
       <name>Rick Giles</name>
-      <roles>   
+      <roles>
         <role>developer</role>
       </roles>
     </developer>
     <developer>
       <id>o_sukhodolsky</id>
       <name>Oleg Sukhodolsky</name>
-      <roles>   
+      <roles>
         <role>developer</role>
       </roles>
     </developer>
     <developer>
       <id>mstudman</id>
       <name>Michael Studman</name>
-      <roles>   
+      <roles>
         <role>developer</role>
       </roles>
     </developer>
     <developer>
       <id>tschneeberger</id>
       <name>Travis Schneeberger</name>
-      <roles>   
+      <roles>
         <role>developer</role>
       </roles>
     </developer>
@@ -104,6 +104,7 @@
   <properties>
     <project.build.sourceEncoding>iso-8859-1</project.build.sourceEncoding>
     <testinputs.dir>${basedir}/src/testinputs/com/puppycrawl/tools/checkstyle</testinputs.dir>
+    <projectVersion>${project.version}</projectVersion>
   </properties>
 
   <dependencies>
diff --git a/src/xdocs/cmdline.xml b/src/xdocs/cmdline.xml.vm
similarity index 93%
rename from src/xdocs/cmdline.xml
rename to src/xdocs/cmdline.xml.vm
index ac700cebf..65125c0a9 100755
--- a/src/xdocs/cmdline.xml
+++ b/src/xdocs/cmdline.xml.vm
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 
   <properties>
     <title>Command Line</title>
@@ -21,7 +23,7 @@
     <section name="Installation">
       <p>
         The easiest way is to include <span
-        class="default">checkstyle-all-@CHECKSTYLE_VERSION@.jar</span> in the
+        class="default">checkstyle-all-${projectVersion}.jar</span> in the
         classpath. If you are running JDK 5.0 this contains all the classes
         required to run Checkstyle. Alternatively, you must include the
         following in the classpath:
@@ -29,7 +31,7 @@
 
       <ol>
         <li>
-          <span class="default">checkstyle-@CHECKSTYLE_VERSION@.jar</span>
+          <span class="default">checkstyle-${projectVersion}.jar</span>
         </li>
         <li>
           ANTLR 2.7.6 classes. <span class="default">antlr.jar</span> is
@@ -197,10 +199,10 @@ java com.puppycrawl.tools.checkstyle.Main -c docs/sun_checks.xml \
           the <span class="code">-jar</span> option. An example would be:
         </p>
 
-        <source><pre>
-java -jar checkstyle-all-@CHECKSTYLE_VERSION@.jar \
+        <source>
+java -jar checkstyle-all-${projectVersion}.jar \
      -c docs/sun_checks.xml Check.java
-        </pre></source>
+        </source>
       </div>
     </section>
   </body>