diff --git a/.gitignore b/.gitignore
index b1c7956..881fa72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/php-myclabs-deep-copy-1.3.0-96fbdc0.tgz
-/php-myclabs-deep-copy-1.3.1-95d6629.tgz
-/php-myclabs-deep-copy-1.4.0-d8093b6.tgz
-/php-myclabs-deep-copy-1.5.0-e3abefc.tgz
+clog
+/php-myclabs-deep-copy-1.5.5-399c1f9.tgz
+/php-myclabs-deep-copy-1.6.0-5a5a9fc.tgz
+/php-myclabs-deep-copy-1.6.1-8e6e041.tgz
diff --git a/php-myclabs-deep-copy-autoload.php b/php-myclabs-deep-copy-autoload.php
index efb6bb4..57c6dfe 100644
--- a/php-myclabs-deep-copy-autoload.php
+++ b/php-myclabs-deep-copy-autoload.php
@@ -1,15 +1,7 @@
 <?php
 /* Autoloader for myclabs/deep-copy and its dependencies */
 
-$vendorDir = '/usr/share/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';
-    }
+require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
 
-    $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
-    $fedoraClassLoader->register();
-}
+\Fedora\Autoloader\Autoload::addPsr4('DeepCopy\\', __DIR__);
 
-$fedoraClassLoader->addPrefix('DeepCopy\\', dirname(__DIR__));
diff --git a/php-myclabs-deep-copy.spec b/php-myclabs-deep-copy.spec
index d570606..f0894cd 100644
--- a/php-myclabs-deep-copy.spec
+++ b/php-myclabs-deep-copy.spec
@@ -1,12 +1,12 @@
-# remirepo spec/Fedora file for php-myclabs-deep-copy
+# remirepo/fedora spec file for php-myclabs-deep-copy
 #
-# Copyright (c) 2015 Remi Collet
+# Copyright (c) 2015-2017 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    e3abefcd7f106677fd352cd7c187d6c969aa9ddc
+%global gh_commit    8e6e04167378abf1ddb4d3522d8755c5fd90d102
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     myclabs
 %global gh_project   DeepCopy
@@ -15,7 +15,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-myclabs-deep-copy
-Version:        1.5.0
+Version:        1.6.1
 Release:        1%{?dist}
 Summary:        Create deep copies (clones) of your objects
 
@@ -38,6 +38,8 @@ BuildRequires:  php-spl
 #        "phpunit/phpunit": "~4.1"
 BuildRequires:  php-composer(doctrine/collections) >= 1
 BuildRequires:  php-composer(phpunit/phpunit) >= 4.1
+# Required by autoloader
+BuildRequires:  php-composer(fedora/autoloader)
 %endif
 
 # From composer.json, "require": {
@@ -46,6 +48,8 @@ Requires:       php(language) >= 5.4
 # From phpcompatinfo report for version 1.3.0
 Requires:       php-reflection
 Requires:       php-spl
+# Required by autoloader
+Requires:       php-composer(fedora/autoloader)
 
 Provides:       php-composer(%{gh_owner}/%{c_project}) = %{version}
 
@@ -77,12 +81,18 @@ mkdir vendor
 cat << 'EOF' | tee vendor/autoload.php
 <?php
 require '%{buildroot}%{php_home}/%{gh_project}/autoload.php';
-$fedoraClassLoader->addPrefix('DeepCopyTest\\', __DIR__ . '/../tests');
-$fedoraClassLoader->addPrefix('Doctrine\\', '%{php_home}');
+\Fedora\Autoloader\Autoload::addPsr4('DeepCopyTest\\', dirname(__DIR__).'/tests/DeepCopyTest/');
+require_once '%{php_home}/Doctrine/Common/Collections/autoload.php';
 EOF
 
-%{_bindir}/php -d include_path=.:%{buildroot}%{php_home}:%{php_home} \
-%{_bindir}/phpunit --verbose
+ret=0
+for cmd in php php56 php70 php71 php72; do
+  if which $cmd; then
+    $cmd -d include_path=.:%{buildroot}%{php_home}:%{php_home} \
+    %{_bindir}/phpunit --verbose || ret=1
+  fi
+done
+exit $ret
 %else
 : Test suite disabled
 %endif
@@ -97,6 +107,29 @@ EOF
 
 
 %changelog
+* Thu Apr 13 2017 Remi Collet <remi@remirepo.net> - 1.6.1-1
+- Update to 1.6.1
+
+* Fri Jan 27 2017 Remi Collet <remi@fedoraproject.org> - 1.6.0-1
+- update to 1.6.0
+
+* Tue Nov  1 2016 Remi Collet <remi@fedoraproject.org> - 1.5.5-1
+- update to 1.5.5
+- switch to fedora/autoloader
+
+* Mon Sep 19 2016 Remi Collet <remi@fedoraproject.org> - 1.5.4-1
+- update to 1.5.4
+
+* Tue Sep 13 2016 Remi Collet <remi@fedoraproject.org> - 1.5.3-1
+- update to 1.5.3
+
+* Wed Sep  7 2016 Remi Collet <remi@fedoraproject.org> - 1.5.2-1
+- update to 1.5.2
+
+* Mon May  2 2016 Remi Collet <remi@fedoraproject.org> - 1.5.1-1
+- update to 1.5.1
+- run test suite with both PHP 5 and 7 when available
+
 * Sun Nov  8 2015 Remi Collet <remi@fedoraproject.org> - 1.5.0-1
 - update to 1.5.0
 
@@ -108,4 +141,4 @@ EOF
 
 * Sat Jul  4 2015 Remi Collet <remi@fedoraproject.org> - 1.3.0-1
 - initial package, version 1.3.0
-- open https://github.com/myclabs/DeepCopy/pull/14 - fix perms
\ No newline at end of file
+- open https://github.com/myclabs/DeepCopy/pull/14 - fix perms
diff --git a/sources b/sources
index 84ee0e0..01d2d96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fe4c60d77836d024be53c36d16dd2ef  php-myclabs-deep-copy-1.5.0-e3abefc.tgz
+SHA512 (php-myclabs-deep-copy-1.6.1-8e6e041.tgz) = d7daab1cc6fa40e9be0d6929f2b4887235f2d4436c84ae6bffa3747bec98bf608351aaa11ef9b4125b3a24a35d9f7b8093c2bbfd1ddc60c1fe2f1b7d0dc81131