diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0a5cb1..719442c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased](https://github.com/orisai/coding-standard-php/compare/3.11.0...v3.x)
 
+### Added
+
+- Support for PHP 8.5 and 8.6
+
 ## [3.11.0](https://github.com/orisai/coding-standard-php/compare/3.10.3...3.11.0) - 2025-04-07
 
 ### Added
diff --git a/composer.json b/composer.json
index f0fa18c..98b75fd 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
 		}
 	],
 	"require": {
-		"php": "7.4 - 8.4",
+		"php": "7.4 - 8.6",
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0",
 		"slevomat/coding-standard": "^8.16.0",
 		"squizlabs/php_codesniffer": "^3.12.0"
diff --git a/docs/README.md b/docs/README.md
index d6c1b78..4bc54d8 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -49,7 +49,7 @@ and [Slevomat Coding Standard](https://github.com/slevomat/coding-standard) rule
 	</ruleset>
 	```
 4. Replace `<VERSION>` with minimal php version you want to support
-	- supported are `7.4`, `8.0`, `8.1`, `8.2`, `8.3`, `8.4`
+	- supported are `7.4`, `8.0`, `8.1`, `8.2`, `8.3`, `8.4`, `8.5`, `8.6`
 5. Replace `<NAMESPACE>` with your root namespace
 	- by default expected code directory is `src` and tests directory is `tests` with `Tests` namespace prefix
 6. Create directory for temp files
diff --git a/src/ruleset-8.5.xml b/src/ruleset-8.5.xml
new file mode 100644
index 0000000..6ce5033
--- /dev/null
+++ b/src/ruleset-8.5.xml
@@ -0,0 +1,60 @@
+<ruleset
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="./../vendor/squizlabs/php_codesniffer/phpcs.xsd">
+	<!-- Configure ruleset -->
+	<config name="php_version" value="80500"/>
+
+	<!-- Import base -->
+	<rule ref="./ruleset-base.xml"/>
+
+	<!-- Version-specific rules -->
+	<!-- - since 7.3 -->
+	<rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall"/>
+	<rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInCall">
+		<properties>
+			<property name="onlySingleLine" value="true"/>
+		</properties>
+	</rule>
+	<!-- - since 7.4 -->
+	<rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceEqualOperator"/>
+	<rule ref="SlevomatCodingStandard.Functions.RequireArrowFunction"/>
+	<rule ref="SlevomatCodingStandard.Functions.ArrowFunctionDeclaration">
+		<properties>
+			<property name="allowMultiLine" value="true"/>
+			<property name="spacesCountAfterKeyword" value="1"/>
+			<property name="spacesCountBeforeArrow" value="1"/>
+			<property name="spacesCountAfterArrow" value="1"/>
+		</properties>
+	</rule>
+	<rule ref="SlevomatCodingStandard.Numbers.RequireNumericLiteralSeparator"/>
+	<!-- - since 8.0 -->
+	<rule ref="SlevomatCodingStandard.Attributes.AttributeAndTargetSpacing"/>
+	<rule ref="SlevomatCodingStandard.Attributes.DisallowAttributesJoining"/>
+	<rule ref="SlevomatCodingStandard.Attributes.DisallowMultipleAttributesPerLine"/>
+	<rule ref="SlevomatCodingStandard.Attributes.RequireAttributeAfterDocComment"/>
+	<rule ref="SlevomatCodingStandard.Classes.RequireConstructorPropertyPromotion"/>
+	<rule ref="SlevomatCodingStandard.ControlStructures.RequireNullSafeObjectOperator"/>
+	<rule ref="SlevomatCodingStandard.Exceptions.RequireNonCapturingCatch"/>
+	<rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInDeclaration">
+		<properties>
+			<property name="onlySingleLine" value="true"/>
+		</properties>
+	</rule>
+	<rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInClosureUse"/>
+	<rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration"/>
+	<rule ref="SlevomatCodingStandard.TypeHints.DNFTypeHintFormat">
+		<properties>
+			<property name="withSpacesAroundOperators" value="no"/>
+			<property name="withSpacesInsideParentheses" value="no"/>
+			<property name="shortNullable" value="no"/>
+			<property name="nullPosition" value="last"/>
+		</properties>
+	</rule>
+	<!-- - since 8.1 -->
+	<!-- - since 8.2 -->
+	<!-- - since 8.3 -->
+	<rule ref="SlevomatCodingStandard.TypeHints.ClassConstantTypeHint"/>
+	<!-- - since 8.4 -->
+	<!-- - since 8.5 -->
+
+</ruleset>
diff --git a/src/ruleset-8.6.xml b/src/ruleset-8.6.xml
new file mode 100644
index 0000000..71500a8
--- /dev/null
+++ b/src/ruleset-8.6.xml
@@ -0,0 +1,61 @@
+<ruleset
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="./../vendor/squizlabs/php_codesniffer/phpcs.xsd">
+	<!-- Configure ruleset -->
+	<config name="php_version" value="80600"/>
+
+	<!-- Import base -->
+	<rule ref="./ruleset-base.xml"/>
+
+	<!-- Version-specific rules -->
+	<!-- - since 7.3 -->
+	<rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall"/>
+	<rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInCall">
+		<properties>
+			<property name="onlySingleLine" value="true"/>
+		</properties>
+	</rule>
+	<!-- - since 7.4 -->
+	<rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceEqualOperator"/>
+	<rule ref="SlevomatCodingStandard.Functions.RequireArrowFunction"/>
+	<rule ref="SlevomatCodingStandard.Functions.ArrowFunctionDeclaration">
+		<properties>
+			<property name="allowMultiLine" value="true"/>
+			<property name="spacesCountAfterKeyword" value="1"/>
+			<property name="spacesCountBeforeArrow" value="1"/>
+			<property name="spacesCountAfterArrow" value="1"/>
+		</properties>
+	</rule>
+	<rule ref="SlevomatCodingStandard.Numbers.RequireNumericLiteralSeparator"/>
+	<!-- - since 8.0 -->
+	<rule ref="SlevomatCodingStandard.Attributes.AttributeAndTargetSpacing"/>
+	<rule ref="SlevomatCodingStandard.Attributes.DisallowAttributesJoining"/>
+	<rule ref="SlevomatCodingStandard.Attributes.DisallowMultipleAttributesPerLine"/>
+	<rule ref="SlevomatCodingStandard.Attributes.RequireAttributeAfterDocComment"/>
+	<rule ref="SlevomatCodingStandard.Classes.RequireConstructorPropertyPromotion"/>
+	<rule ref="SlevomatCodingStandard.ControlStructures.RequireNullSafeObjectOperator"/>
+	<rule ref="SlevomatCodingStandard.Exceptions.RequireNonCapturingCatch"/>
+	<rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInDeclaration">
+		<properties>
+			<property name="onlySingleLine" value="true"/>
+		</properties>
+	</rule>
+	<rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInClosureUse"/>
+	<rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration"/>
+	<rule ref="SlevomatCodingStandard.TypeHints.DNFTypeHintFormat">
+		<properties>
+			<property name="withSpacesAroundOperators" value="no"/>
+			<property name="withSpacesInsideParentheses" value="no"/>
+			<property name="shortNullable" value="no"/>
+			<property name="nullPosition" value="last"/>
+		</properties>
+	</rule>
+	<!-- - since 8.1 -->
+	<!-- - since 8.2 -->
+	<!-- - since 8.3 -->
+	<rule ref="SlevomatCodingStandard.TypeHints.ClassConstantTypeHint"/>
+	<!-- - since 8.4 -->
+	<!-- - since 8.5 -->
+	<!-- - since 8.6 -->
+
+</ruleset>