diff --git a/checkstyle.xml b/checkstyle.xml
index 7ee3a5e..6b611d3 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -23,20 +23,18 @@
     "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
     "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
 
-<!-- commons codec customization of default Checkstyle behavior -->
+<!-- commons logging customization of default Checkstyle behavior -->
 <module name="Checker">
-  <property name="basedir" value="src/checkstyle"/>
   <property name="localeLanguage" value="en"/>
 
   <module name="TreeWalker">
     <!-- Verify that EVERY source file has the appropriate license -->
     <module name="Header">
-      <property name="headerFile" value="LICENSE.txt"/>
-      <property name="ignoreLines" value="2,3,4,10"/>
+      <property name="headerFile" value="license-header.txt"/>
     </module>
 
     <module name="OperatorWrap">
-      <property name="option" value="eol"/>
+      <property name="option" value="nl"/>
     </module>
   </module>
 </module>
diff --git a/license-header.txt b/license-header.txt
new file mode 100644
index 0000000..57280ce
--- /dev/null
+++ b/license-header.txt
@@ -0,0 +1,18 @@
+/*
+ * 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
diff --git a/project.properties b/project.properties
index 864a834..821dd53 100644
--- a/project.properties
+++ b/project.properties
@@ -18,6 +18,8 @@ maven.repo.remote=http://repo1.maven.org/maven
 
 maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
 
+maven.checkstyle.properties=checkstyle.xml
+
 # documentation properties
 maven.xdoc.date=left
 maven.xdoc.version=${pom.currentVersion}
diff --git a/project.xml b/project.xml
index 4d9f725..f98ac4c 100644
--- a/project.xml
+++ b/project.xml
@@ -281,6 +281,9 @@ 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>