Index: /trunk/tools/checkstyle/META-INF/MANIFEST.MF
===================================================================
--- /trunk/tools/checkstyle/META-INF/MANIFEST.MF	(revision 13226)
+++ /trunk/tools/checkstyle/META-INF/MANIFEST.MF	(revision 13227)
@@ -3,5 +3,5 @@
 Bundle-Name: JOSM Checkstyle Eclipse Plugin
 Bundle-SymbolicName: org.openstreetmap.josm.checkstyle-eclipse-plugin;singleton:=true
-Bundle-Version: 8.0.0.qualifier
+Bundle-Version: 8.5.0.qualifier
 Require-Bundle: net.sf.eclipsecs.checkstyle,
  net.sf.eclipsecs.core,
Index: /trunk/tools/checkstyle/josm_checks.xml
===================================================================
--- /trunk/tools/checkstyle/josm_checks.xml	(revision 13226)
+++ /trunk/tools/checkstyle/josm_checks.xml	(revision 13227)
@@ -21,5 +21,4 @@
     </module>
     <module name="CommentsIndentation"/>
-    <module name="FileContentsHolder"/>
     <module name="MissingDeprecated"/>
     <module name="MissingOverride"/>
@@ -90,7 +89,5 @@
     </module>
     <module name="EmptyCatchBlock"/>
-    <module name="LeftCurly">
-      <property name="maxLineLength" value="140"/>
-    </module>
+    <module name="LeftCurly"/>
     <module name="RightCurly"/>
     <module name="NeedBraces">
@@ -104,4 +101,9 @@
     <module name="HideUtilityClassConstructor"/>
     <module name="org.openstreetmap.josm.TopLevelJavadocCheck"/>
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="CHECKSTYLE\.OFF\: ([\w\|]+)"/>
+      <property name="onCommentFormat" value="CHECKSTYLE\.ON\: ([\w\|]+)"/>
+      <property name="checkFormat" value="$1"/>
+    </module>
   </module>
   <module name="Header">
@@ -111,9 +113,4 @@
   <module name="FileLength">
     <property name="fileExtensions" value=".java"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CHECKSTYLE\.OFF\: ([\w\|]+)"/>
-    <property name="onCommentFormat" value="CHECKSTYLE\.ON\: ([\w\|]+)"/>
-    <property name="checkFormat" value="$1"/>
   </module>
   <module name="FileTabCharacter"/>
Index: /trunk/tools/checkstyle/josm_filters.xml
===================================================================
--- /trunk/tools/checkstyle/josm_filters.xml	(revision 13226)
+++ /trunk/tools/checkstyle/josm_filters.xml	(revision 13227)
@@ -45,5 +45,4 @@
   <suppress checks="HeaderCheck" files="MultiSplitLayout\.java" />
   <suppress checks="HeaderCheck" files="MultiSplitPane\.java" />
-  <suppress checks="HeaderCheck" files="DNSName(Fix)?\.java" />
   <suppress checks="FileLengthCheck" files="DomainValidator\.java" />
   <suppress checks="org.openstreetmap.josm.TopLevelJavadocCheck" files="package-info\.java" />