diff --git a/pmd-core/etc/checkstyle-config.xml b/pmd-core/etc/checkstyle-config.xml
index 3fd1709502..9d6a7819ff 100644
--- a/pmd-core/etc/checkstyle-config.xml
+++ b/pmd-core/etc/checkstyle-config.xml
@@ -1,74 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+    This configuration file was written by the eclipse-cs plugin configuration editor
+-->
+<!--
+    Checkstyle-Configuration: PMD checkstyle
+    Description: none
+-->
 <module name="Checker">
-
-    <property name="severity"           value="warning"/>
-
-    <!-- JDocPackage
-    TODO: I don't know if this one is really relevant
-    <module name="PackageHtml">
-        <property name="severity"   value="error"/>
+  <property name="severity" value="warning"/>
+  <module name="TreeWalker">
+    <property name="tabWidth" value="4"/>
+    <module name="JavadocStyle">
+      <property name="severity" value="warning"/>
+      <property name="checkEmptyJavadoc" value="true"/>
+      <property name="checkFirstSentence" value="false"/>
     </module>
-    -->
-
-    <module name="TreeWalker">
-
-         <!-- JDocHtmlValid, JDocHeader -->
-        <module name="JavadocStyle">
-            <property name="checkFirstSentence" value="false"/>
-            <property name="checkEmptyJavadoc"  value="true"/>
-            <property name="severity"           value="error"/>
-        </module>
-
-        <!-- JDocHeader -->
-        <module name="JavadocType">
-            <property name="severity"           value="error"/>
-        </module>
-
-        <!-- JDocMethod-1, JDocMethod-3, JDocException-1 -->
-        <module name="JavadocMethod">
-            <property name="severity"   value="error"/>
-            <property name="scope"      value="package"/>
-            <property name="allowUndeclaredRTE" value="true"/>
-            <property name="allowMissingPropertyJavadoc" value="true"/>
-        </module>
-
-        <!-- JDocMethod-1 -->
-        <module name="JavadocVariable">
-            <property name="severity"   value="error"/>
-            <property name="scope"      value="package"/>
-        </module>
-
-        <!-- AvoidStarImport -->
-        <module name="AvoidStarImport">
-            <property name="severity"   value="error"/>
-        </module>
-
-        <module name="TodoComment">
-            <property name="format" value="TODO"/>
-        </module>
-        <module name="TodoComment">
-            <property name="format" value="FUTURE"/>
-        </module>
+    <module name="JavadocType">
+      <property name="severity" value="warning"/>
     </module>
-    
-    <!-- RegexpHeader -->
-    <!--
-            Assert if header is :
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-    -->
-    <module name="RegexpHeader">
-        <property
-            name="header"
-            value="^\/\*\*[ ]*$\n^[ ]+\*[ ]+BSD-style license; for more info see http:\/\/pmd.sourceforge.net/license.html[ ]*\n[ ]+\*\/[ ]*$"/>
-        <property name="fileExtensions" value="java"/>
+    <module name="JavadocMethod">
+      <property name="severity" value="warning"/>
+      <property name="scope" value="package"/>
+      <property name="allowUndeclaredRTE" value="true"/>
+      <property name="allowMissingPropertyJavadoc" value="true"/>
     </module>
-    <module name="RegexpHeader">
-        <property
-            name="header"
-            value="^#$\n^# BSD-style license; for more info see http:\/\/pmd.sourceforge.net/license.html$\n^#$"/>
-        <property name="fileExtensions" value="properties"/>
+    <module name="JavadocVariable">
+      <property name="severity" value="warning"/>
+      <property name="scope" value="package"/>
     </module>
+    <module name="AvoidStarImport">
+      <property name="severity" value="error"/>
+    </module>
+    <module name="TodoComment">
+      <property name="format" value="TODO"/>
+    </module>
+    <module name="TodoComment">
+      <property name="format" value="FUTURE"/>
+    </module>
+    <module name="RedundantImport">
+      <property name="severity" value="error"/>
+    </module>
+  </module>
+  <module name="RegexpHeader">
+    <property name="severity" value="error"/>
+    <property name="header" value="^\/\*\*[ ]*$\n^[ ]+\*[ ]+BSD-style license; for more info see http:\/\/pmd.sourceforge.net/license.html[ ]*\n[ ]+\*\/[ ]*$"/>
+    <property name="fileExtensions" value="java"/>
+  </module>
+  <module name="RegexpHeader">
+    <property name="severity" value="error"/>
+    <property name="header" value="^#$\n^# BSD-style license; for more info see http:\/\/pmd.sourceforge.net/license.html$\n^#$"/>
+    <property name="fileExtensions" value="properties"/>
+  </module>
+  <module name="FileTabCharacter">
+    <property name="severity" value="error"/>
+    <property name="fileExtensions" value="java,xml"/>
+  </module>
+  <module name="JavadocPackage">
+    <property name="severity" value="warning"/>
+  </module>
 </module>