diff --git a/checkstyle.xml b/checkstyle.xml
index 10ba82f..302c2fd 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -30,7 +30,7 @@
   <module name="TreeWalker">
     <!-- Verify that EVERY source file has the appropriate license -->
     <module name="Header">
-      <property name="headerFile" value="${basedir}/LICENSE-header.txt"/>
+      <property name="headerFile" value="${checkstyle.header.file}"/>
     </module>
 
     <module name="OperatorWrap">
diff --git a/license-header.txt b/license-header.txt
index 57280ce..c3e9f2a 100644
--- a/license-header.txt
+++ b/license-header.txt
@@ -1,18 +1,16 @@
 /*
- * 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.    
- */
\ No newline at end of file
+ * 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.
+ */ 
diff --git a/pom.xml b/pom.xml
index 86f565b..4011e27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -483,19 +483,20 @@ under the License.
 
   <reporting>
     <plugins>
-      <!--
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.1</version>
         <configuration>
-          <configLocation>checkstyle.xml</configLocation>
+          <configLocation>${basedir}/checkstyle.xml</configLocation>
+          <enableRulesSummary>false</enableRulesSummary>
+          <headerFile>${basedir}/license-header.txt</headerFile>
         </configuration>
       </plugin>
-      -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>clirr-maven-plugin</artifactId>
-        <version>2.1.1</version>
+        <version>2.2</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/project.properties b/project.properties
index cc279c5..16d59eb 100644
--- a/project.properties
+++ b/project.properties
@@ -19,6 +19,7 @@ maven.repo.remote=http://repo1.maven.org/maven
 maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
 
 maven.checkstyle.properties=checkstyle.xml
+maven.checkstyle.header.file=${basedir}/license-header.txt
 
 # documentation properties
 maven.xdoc.date=left
diff --git a/project.xml b/project.xml
index 7c3ced0..e35d305 100644
--- a/project.xml
+++ b/project.xml
@@ -281,9 +281,7 @@ There is no easy way to run these under maven at the moment.
   </build>
 
   <reports>
-    <!--
     <report>maven-checkstyle-plugin</report>
-    -->
     <report>maven-javadoc-plugin</report>
     <report>maven-jdepend-plugin</report>
     <report>maven-junit-report-plugin</report>