diff --git a/README.md b/README.md
index 377d2c25..a7457218 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ Compatibility matrix from checkstyle team:
 
 Checkstyle Plugin|Sonar|Checkstyle|Jdk
 -----------------|-----|----------|---
+4.18|6.7  |8.18|1.8
 4.17|6.7  |8.17|1.8
 4.16|5.6.6|8.16|1.8
 4.15|5.6.6|8.15|1.8
diff --git a/checkstyle-sonar-plugin/src/main/java/org/sonar/plugins/checkstyle/CheckstyleProfileImporter.java b/checkstyle-sonar-plugin/src/main/java/org/sonar/plugins/checkstyle/CheckstyleProfileImporter.java
index 0b6ee166..5b3c1cb5 100644
--- a/checkstyle-sonar-plugin/src/main/java/org/sonar/plugins/checkstyle/CheckstyleProfileImporter.java
+++ b/checkstyle-sonar-plugin/src/main/java/org/sonar/plugins/checkstyle/CheckstyleProfileImporter.java
@@ -60,6 +60,7 @@ public class CheckstyleProfileImporter extends ProfileImporter {
         "SuppressWarningsFilter",
         "SuppressionCommentFilter",
         "SuppressWithNearbyCommentFilter",
+        "SuppressionXpathSingleFilter",
     };
     private final RuleFinder ruleFinder;
 
diff --git a/checkstyle-sonar-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties b/checkstyle-sonar-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties
index 2b058510..a3a62601 100644
--- a/checkstyle-sonar-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties
+++ b/checkstyle-sonar-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties
@@ -241,7 +241,7 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.n
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.ignoredMethodNames=methods that should not be checked
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.illegalClassNames=classes that should not be used as types in variable declarations, return values or parameters.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.legalAbstractClassNames=abstract classes that may be used as types.
-rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.format=pattern for illegal class name
+rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.illegalAbstractClassNameFormat=pattern for illegal class name
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.memberModifiers=Methods and fields with only corresponding modifiers (comma separated). Available options are: LITERAL_PUBLIC, LITERAL_PROTECTED, LITERAL_PRIVATE, ABSTRACT, LITERAL_STATIC, FINAL, LITERAL_TRANSIENT, LITERAL_VOLATILE, LITERAL_SYNCHRONIZED, LITERAL_NATIVE, STRICTFP, ANNOTATION, LITERAL_DEFAULT
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.tokens=tokens to check
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck.param.validateAbstractClassNames=Whether to validate abstract class names
diff --git a/checkstyle-sonar-plugin/src/main/resources/org/sonar/plugins/checkstyle/rules.xml b/checkstyle-sonar-plugin/src/main/resources/org/sonar/plugins/checkstyle/rules.xml
index 3b5e1f64..0d894517 100644
--- a/checkstyle-sonar-plugin/src/main/resources/org/sonar/plugins/checkstyle/rules.xml
+++ b/checkstyle-sonar-plugin/src/main/resources/org/sonar/plugins/checkstyle/rules.xml
@@ -715,7 +715,7 @@
     <param key="ignoredMethodNames" type="s{}">
       <defaultValue>"getInitialContext,getEnvironment"</defaultValue>
     </param>
-    <param key="format" type="REGULAR_EXPRESSION">
+    <param key="illegalAbstractClassNameFormat" type="REGULAR_EXPRESSION">
       <defaultValue>^(.*[\\.])?Abstract.*$</defaultValue>
     </param>
     <!--
@@ -1938,7 +1938,7 @@
     <param key="allowSamelineParameterizedAnnotation" type="BOOLEAN">
       <defaultValue>false</defaultValue>
     </param>
-    <param key="tokens" type="s[CLASS_DEF,INTERFACE_DEF,ENUM_DEF,METHOD_DEF,CTOR_DEF,VARIABLE_DEF,PARAMETER_DEF,ANNOTATION_DEF,TYPECAST,LITERAL_THROWS,IMPLEMENTS_CLAUSE,TYPE_ARGUMENT,LITERAL_NEW,DOT,ANNOTATION_FIELD_DEF]">
+    <param key="tokens" type="s[CLASS_DEF,INTERFACE_DEF,ENUM_DEF,METHOD_DEF,CTOR_DEF,VARIABLE_DEF,PARAMETER_DEF,ANNOTATION_DEF,ANNOTATION_FIELD_DEF]">
       <defaultValue>CLASS_DEF,INTERFACE_DEF,ENUM_DEF,METHOD_DEF,CTOR_DEF,VARIABLE_DEF</defaultValue>
     </param>
   </rule>
diff --git a/pom.xml b/pom.xml
index 38714ed6..f66a562a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
   </ciManagement>
 
   <properties>
-    <checkstyle.version>8.17</checkstyle.version>
+    <checkstyle.version>8.18</checkstyle.version>
     <sonar.version>6.7</sonar.version>
     <sonar-java.version>5.9.1.16423</sonar-java.version>
     <java.version>1.8</java.version>