diff --git a/.gitignore b/.gitignore
index dc8b6bb..e96d16d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ clog
 /php-compat-info-4.5.2-4fc02f5.tar.gz
 /php-compat-info-5.0.0-1b65ee3.tar.gz
 /php-compat-info-5.0.1-300a168.tar.gz
+/php-compat-info-5.0.2-49d6752.tar.gz
diff --git a/php-bartlett-PHP-CompatInfo-5.0.0-autoload.php b/php-bartlett-PHP-CompatInfo-5.0.0-autoload.php
index cf3b6a5..4297383 100644
--- a/php-bartlett-PHP-CompatInfo-5.0.0-autoload.php
+++ b/php-bartlett-PHP-CompatInfo-5.0.0-autoload.php
@@ -3,21 +3,11 @@
  * Autoloader for bartlett/php-compatinfo and its dependencies
  */
 
-$vendorDir = '/usr/share/php';
+require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
 
-// Use Symfony autoloader
-if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
-    if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
-        require_once $vendorDir . '/Symfony/Component/ClassLoader/ClassLoader.php';
-    }
-
-    $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
-    $fedoraClassLoader->register();
-}
-$fedoraClassLoader->addPrefixes(array(
-    'Bartlett\\CompatInfo'                  => dirname(dirname(__DIR__)),
+\Fedora\Autoloader\Autoload::addPsr4('Bartlett\\CompatInfo\\', __DIR__);
+\Fedora\Autoloader\Dependencies::required(array(
+    '/usr/share/php/Bartlett/Reflect/autoload.php',
+    '/usr/share/php/Bartlett/CompatInfoDb/autoload.php',
 ));
 
-// Dependencies
-require_once $vendorDir . '/Bartlett/Reflect/autoload.php';
-require_once $vendorDir . '/Bartlett/CompatInfoDb/autoload.php';
diff --git a/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch b/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch
index ed5eed3..55a4c09 100644
--- a/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch
+++ b/php-bartlett-PHP-CompatInfo-5.0.0-rpm.patch
@@ -82,18 +82,4 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo
 -$application = new Application($appName, '5.0');
 +$application = new Application($appName, '@package_version@');
  $application->run();
-diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
---- ./src/Bartlett/CompatInfo/Console/Application.php.rpm	2016-03-09 18:38:00.713180108 +0100
-+++ ./src/Bartlett/CompatInfo/Console/Application.php	2016-03-09 18:36:09.737741387 +0100
-@@ -52,9 +52,10 @@
-         $v = Environment::versionRefDb();
- 
-         return sprintf(
--            '<info>%s</info> version <comment>%s</comment> DB built <comment>%s</comment>',
-+            '<info>%s</info> version <comment>%s</comment> DB version <comment>%s</comment> built <comment>%s</comment>',
-             $this->getName(),
-             $this->getVersion(),
-+            $v['build.version'],
-             $v['build.string']
-         );
-     }
+
diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index 0e493ce..a1c4c17 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %{!?php_version:  %global php_version  %(php -r 'echo PHP_VERSION;' 2>/dev/null)}
-%global gh_commit    300a1689891aa97a6733ef496081ec394f53486b
+%global gh_commit    49d67523234b35697a0b5b6b2dd8e9b6a23f44cb
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20151005
 %global gh_owner     llaville
@@ -16,7 +16,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 
 Name:           php-bartlett-PHP-CompatInfo
-Version:        5.0.1
+Version:        5.0.2
 %global specrel 1
 Release:        %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        Find out version and the extensions required for a piece of code to run
@@ -42,9 +42,9 @@ BuildRequires:  php(language) >= 5.4.0
 BuildRequires:  %{_bindir}/phpunit
 BuildRequires:  php-pdo_sqlite
 BuildRequires:  php-composer(bartlett/php-reflect) >= 4.0
-BuildRequires:  php-composer(bartlett/php-compatinfo-db) >= 1.0
+BuildRequires:  php-composer(bartlett/php-compatinfo-db) >= 1.15
 # For our patch / autoloader
-BuildRequires:  php-composer(symfony/class-loader)
+BuildRequires:  php-composer(fedora/autoloader)
 %endif
 
 # From composer.json, "require"
@@ -66,7 +66,7 @@ Requires:       php-pdo_sqlite
 Requires:       php-spl
 Requires:       php-composer(bartlett/php-reflect) >= 4.0
 Requires:       php-composer(bartlett/php-reflect) <  5
-Requires:       php-composer(bartlett/php-compatinfo-db) >= 1.0
+Requires:       php-composer(bartlett/php-compatinfo-db) >= 1.15
 Requires:       php-composer(bartlett/php-compatinfo-db) <  2
 Requires:       php-composer(symfony/console)      >= 2.5
 Requires:       php-composer(symfony/console)      <  3
@@ -89,7 +89,7 @@ Requires:       php-composer(symfony/console)      <  3
 #        "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2"
 #        "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)"
 # Required by autoloader
-Requires:       php-composer(symfony/class-loader)
+Requires:       php-composer(fedora/autoloader)
 
 Provides:       phpcompatinfo = %{version}
 Provides:       php-composer(bartlett/php-compatinfo) = %{version}
@@ -162,6 +162,10 @@ fi
 
 
 %changelog
+* Fri Dec 16 2016 Remi Collet <remi@fedoraproject.org> - 5.0.2-1
+- update to 5.0.2
+- switch to fedora/autoloader
+
 * Wed Jul  6 2016 Remi Collet <remi@fedoraproject.org> - 5.0.1-1
 - update to 5.0.1
 - display DB version instead of build date
diff --git a/sources b/sources
index 224774e..1158ed2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39dd2634b30358d36980638be65294c9  php-compat-info-5.0.1-300a168.tar.gz
+SHA512 (php-compat-info-5.0.2-49d6752.tar.gz) = 900ed00366c4253d032a915ee95972aece04f11b6bfe323a75dc0183c308c89123296eec352d1424c4d65459dca2b95690f27db28de362c9bb0c22951715b2dc