diff --git a/.gitignore b/.gitignore
index 39a07fe..836ca3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,6 @@ clog
 /PHP_CodeSniffer-3.5.3.tgz
 /PHP_CodeSniffer-3.5.4.tgz
 /PHP_CodeSniffer-3.5.5.tgz
+/PHP_CodeSniffer-3.5.6.tgz
+/PHP_CodeSniffer-3.5.8.tgz
+/PHP_CodeSniffer-3.6.0.tgz
diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec
index a0fe648..820a717 100644
--- a/php-pear-PHP-CodeSniffer.spec
+++ b/php-pear-PHP-CodeSniffer.spec
@@ -1,6 +1,6 @@
 # spec file for php-pear-PHP-CodeSniffer
 #
-# Copyright (c) 2013-2020 Remi Collet
+# Copyright (c) 2013-2021 Remi Collet
 # Copyright (c) 2009-2013 Christof Damian
 # Copyright (c) 2006-2009 Konstantin Ryabitsev
 #
@@ -13,7 +13,7 @@
 %global pear_name     PHP_CodeSniffer
 
 Name:           php-pear-PHP-CodeSniffer
-Version:        3.5.5
+Version:        3.6.0
 Release:        1%{?dist}
 Summary:        PHP coding standards enforcement tool
 
@@ -86,16 +86,17 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir}
 %check
 cd %{pear_name}-%{version}
 
-# fix broken pear detection (may use export PHP_CODESNIFFER_PEAR=1 if PR accepted)
-# https://github.com/squizlabs/PHP_CodeSniffer/pull/2847
-sed -e '/PHP_CODESNIFFER_PEAR/s/false/true/' -i tests/AllTests.php
-
 # fails with js: Couldn't read source file
 rm src/Standards/Generic/Tests/Debug/JSHintUnitTest.*
 
-# Version 3.4.0: Tests: 364, Assertions: 419, Skipped: 3.
+# Fix current date
+YEAR=$(date +%Y)
+sed -e "/@copyright/s/2020/${YEAR}/" \
+    -i src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.*.fixed
+
+# Version 3.6.0: Tests: 1183, Assertions: 8128, Skipped: 8.
 ret=0
-for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do
+for cmdarg in "php %{phpunit}" php73 php74 php80; do
   if which $cmdarg; then
     set $cmdarg
     $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit7} \
@@ -127,6 +128,15 @@ fi
 
 
 %changelog
+* Fri Apr  9 2021 Remi Collet <remi@remirepo.net> - 3.6.0-1
+- update to 3.6.0
+
+* Fri Oct 23 2020 Remi Collet <remi@remirepo.net> - 3.5.8-1
+- update to 3.5.8
+
+* Tue Aug 11 2020 Remi Collet <remi@remirepo.net> - 3.5.6-1
+- update to 3.5.6
+
 * Mon Apr 20 2020 Remi Collet <remi@remirepo.net> - 3.5.5-1
 - update to 3.5.5
 
diff --git a/sources b/sources
index e80bf94..31aa47b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (PHP_CodeSniffer-3.5.5.tgz) = dad676069122d879b8afb665d661bcd1c810c762b44738765231f8c8cc90d20e7e581690b7e725cdc24438be26fa3185f3556a300798ed5a03cff51f5cbb5d4d
+SHA512 (PHP_CodeSniffer-3.6.0.tgz) = 09c98ac460c6dc70637d2f4d81a1e46bdf742ee14d0b56032e8dbcaf7a0ff03f3fdb1abdf8144f664a33298cf397c732ba62027bcee41f1f4f740d12fa29f6a8