diff --git a/.gitignore b/.gitignore
index 6d84219..b2c1991 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@ clog
 /php-symfony4-4.4.17-02562a0eff211123b7ee2204f9b7fc86134a8a8e.tar.gz
 /php-symfony4-4.4.18-a05cc024d3d43cb84faea3969de8cc2e590e7a83.tar.gz
 /php-symfony4-4.4.20-fb90227.tgz
+/php-symfony4-4.4.21-0139b7a.tgz
diff --git a/composer.json b/composer.json
index 63108b1..737f767 100644
--- a/composer.json
+++ b/composer.json
@@ -134,15 +134,16 @@
         "predis/predis": "~1.1",
         "psr/http-client": "^1.0",
         "psr/simple-cache": "^1.0",
-        "egulias/email-validator": "^2.1.10",
+        "egulias/email-validator": "^2.1.10|^3.1",
         "symfony/phpunit-bridge": "^5.2",
         "symfony/security-acl": "~2.8|~3.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-        "twig/cssinliner-extra": "^2.12",
-        "twig/inky-extra": "^2.12",
-        "twig/markdown-extra": "^2.12"
+        "twig/cssinliner-extra": "^2.12|^3",
+        "twig/inky-extra": "^2.12|^3",
+        "twig/markdown-extra": "^2.12|^3"
     },
     "conflict": {
+        "egulias/email-validator": "~3.0.0",
         "masterminds/html5": "<2.6",
         "monolog/monolog": ">=2",
         "phpdocumentor/reflection-docblock": "<3.0|>=3.2.0,<3.2.2",
diff --git a/php-symfony4-generate-autoloaders.php b/php-symfony4-generate-autoloaders.php
index 2e7742e..ca155fe 100755
--- a/php-symfony4-generate-autoloaders.php
+++ b/php-symfony4-generate-autoloaders.php
@@ -73,16 +73,16 @@ final class AutoloadGenerator {
         ],
         'doctrine/dbal' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
-             [
-                'path' => 'Doctrine/DBAL3/autoload.php',
-                'path' => 'Doctrine/DBAL/autoload.php',
+             'path' => [
+                'Doctrine/DBAL3/autoload.php',
+                'Doctrine/DBAL/autoload.php',
              ],
         ],
         'doctrine/doctrine-bundle' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
-            [
-                'path' => 'Doctrine/Bundle/DoctrineBundle2/autoload.php',
-                'path' => 'Doctrine/Bundle/DoctrineBundle/autoload.php',
+            'path' => [
+                'Doctrine/Bundle/DoctrineBundle2/autoload.php',
+                'Doctrine/Bundle/DoctrineBundle/autoload.php',
             ],
         ],
         'doctrine/orm' => [
@@ -91,7 +91,10 @@ final class AutoloadGenerator {
         ],
         'egulias/email-validator' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
-            'path' => 'Egulias/EmailValidator2/autoload.php',
+            'path' => [
+                'Egulias/EmailValidator3/autoload.php',
+                'Egulias/EmailValidator2/autoload.php',
+            ],
         ],
         'guzzlehttp/promises' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
@@ -302,7 +305,7 @@ final class AutoloadGenerator {
         ],
         'symfony/monolog-bridge' => [
             'prefix' => 'FEDORA_SYMFONY4_DIR',
-            'path' => 'Component/Monolog/autoload.php',
+            'path' => 'Bridge/Monolog/autoload.php',
         ],
         'symfony/options-resolver' => [
             'prefix' => 'FEDORA_SYMFONY4_DIR',
diff --git a/php-symfony4.spec b/php-symfony4.spec
index 6c4f258..82af870 100644
--- a/php-symfony4.spec
+++ b/php-symfony4.spec
@@ -12,8 +12,8 @@
 
 %global github_owner     symfony
 %global github_name      symfony
-%global github_version   4.4.20
-%global github_commit    fb90227d34531b06c01f1450c0c490fbf3fd7a8e
+%global github_version   4.4.21
+%global github_commit    0139b7a74507b39b1ace35fa5544be5aee1dca5f
 %global github_short     %(c=%{github_commit}; echo ${c:0:7})
 
 %global composer_vendor  symfony
@@ -53,9 +53,9 @@
 # "doctrine/orm": "^2.6.3"
 %global doctrine_orm_min_ver 2.6.3
 %global doctrine_orm_max_ver 3.0
-# "egulias/email-validator": "^2.1.10"
+# "egulias/email-validator": "^2.1.10|^3.1"
 %global email_validator_min_ver 2.1.10
-%global email_validator_max_ver 3.0
+%global email_validator_max_ver 4
 # "guzzlehttp/promises": "^1.3.1"
 %global guzzlehttp_promises_min_ver 1.3.1
 %global guzzlehttp_promises_max_ver 2
@@ -120,8 +120,8 @@
 %global psr_http_client_min_ver 1.0
 %global psr_http_client_max_ver 2
 
-# Build using "--without tests" to disable tests
-%global with_tests 0%{?_with_tests:1}
+# Build using "--with tests" to enable tests
+%bcond_with tests
 
 %global with_sensio_framework_extra_bundle 0
 
@@ -280,10 +280,10 @@ BuildRequires: php-sysvsem
 BuildRequires: php-tokenizer
 BuildRequires: php-xml
 BuildRequires: php-xmlreader
-## Autoloader
-BuildRequires: php-fedora-autoloader-devel
 # Conflicts
 BuildConflicts: php-composer(phpdocumentor/type-resolver) < 0.3.0
+## Autoloader
+BuildRequires: php-fedora-autoloader-devel
 
 # Bridges
 Requires:      php-composer(%{composer_vendor}/doctrine-bridge) = %{version}
@@ -2321,7 +2321,7 @@ AUTOLOAD
 done
 
 : Create dummy Composer autoloader for tests
-%if %{with_tests}
+%if %{with tests}
 pushd src/Symfony
 cat <<COMPOSER_JSON | tee composer.json
 {
@@ -2355,7 +2355,7 @@ ln -s %{name}-common-%{version} %{buildroot}%{_docdir}/%{name}-%{version}
 
 
 %check
-%if %{with_tests}
+%if %{with tests}
 : Ensure TZ is set
 cp -pf %{_sysconfdir}/php.ini .
 echo "date.timezone=UTC" >> php.ini
@@ -2436,7 +2436,7 @@ exit $RET
      %{symfony4_dir}/Bundle/autoload.php
 %dir %{symfony4_dir}/Component
      %{symfony4_dir}/Component/autoload.php
-%if %{with_tests}
+%if %{with tests}
 %exclude %{symfony4_dir}/vendor
 %endif
 
@@ -3302,6 +3302,10 @@ exit $RET
 # ##############################################################################
 
 %changelog
+* Mon Mar 29 2021 Remi Collet <remi@remirepo.net> - 4.4.21-1
+- update to 4.4.21
+- allow egulias/email-validator v3
+
 * Mon Mar  8 2021 Remi Collet <remi@remirepo.net> - 4.4.20-1
 - update to 4.4.20
 - drop dependency on ocramius/proxy-manager
diff --git a/sources b/sources
index 1f4be52..00ca99c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-symfony4-4.4.20-fb90227.tgz) = a1e9802c9a43ed495cbe9db8720c9149be789998dc493973c4acb75e635ccf4ef2ba68127509562090b5da2eb1ca4fdd6bc7ddc12bc6f164d3c67efae08352f6
+SHA512 (php-symfony4-4.4.21-0139b7a.tgz) = 8eaf3bc8792f702918e6bf8f0941cc1e85e52f9e1471db8bbcc02c278075b441a27da1db35f5bc2e7e6d0401a73dd87cd531b48cc774c08b6207bdc4974270a9