diff --git a/.gitignore b/.gitignore
index 73ec195..bc97d92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,12 @@
 /php-league-flysystem-1.0.28-a966364.tgz
 /php-league-flysystem-1.0.29-b732cc9.tgz
 /php-league-flysystem-1.0.31-521a233.tgz
+/php-league-flysystem-1.0.33-5c7f984.tgz
+/php-league-flysystem-1.0.34-469ad53.tgz
+/php-league-flysystem-1.0.35-dda7f3a.tgz
+/php-league-flysystem-1.0.36-d9c1698.tgz
+/php-league-flysystem-1.0.37-78b5cc4.tgz
+/php-league-flysystem-1.0.38-4ba6e13.tgz
+/php-league-flysystem-1.0.39-2474325.tgz
+/php-league-flysystem-1.0.40-3828f0b.tgz
+/php-league-flysystem-1.0.41-f400aa9.tgz
diff --git a/php-league-flysystem.spec b/php-league-flysystem.spec
index f8ce47b..8a2726a 100644
--- a/php-league-flysystem.spec
+++ b/php-league-flysystem.spec
@@ -1,13 +1,13 @@
 # remirepo/fedora spec file for php-league-flysystem
 #
-# Copyright (c) 2016 Remi Collet
+# Copyright (c) 2016-2017 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 # Github
-%global gh_commit    521a233642773505222a5dd53231ccf5b0607d5a
+%global gh_commit    f400aa98912c561ba625ea4065031b7a41e5a155
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     thephpleague
 %global gh_project   flysystem
@@ -19,7 +19,7 @@
 %global ns_project   Flysystem
 
 Name:           php-%{pk_vendor}-%{pk_name}
-Version:        1.0.31
+Version:        1.0.41
 Release:        1%{?dist}
 Summary:        Filesystem abstraction: Many filesystems, one API
 
@@ -29,8 +29,6 @@ URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        %{name}-%{version}-%{gh_short}.tgz
 # Create git snapshot as tests are excluded from official tarball
 Source1:        makesrc.sh
-# Autoloader
-Source2:        %{name}-autoload.php
 
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.5.9
@@ -49,7 +47,7 @@ BuildRequires:  php-composer(phpunit/phpunit) >= 4.0
 BuildRequires:  php-composer(mockery/mockery) >= 0.9
 BuildRequires:  php-composer(phpspec/phpspec) >= 2.2
 # Autoloader
-BuildRequires:  php-composer(symfony/class-loader)
+BuildRequires:  php-composer(fedora/autoloader)
 
 # From composer.json, "require": {
 Requires:       php(language) >= 5.5.9
@@ -62,7 +60,7 @@ Requires:       php-mbstring
 Requires:       php-pcre
 Requires:       php-spl
 # Autoloader
-Requires:       php-composer(symfony/class-loader)
+Requires:       php-composer(fedora/autoloader)
 
 Provides:       php-composer(%{pk_vendor}/%{pk_name}) = %{version}
 
@@ -77,15 +75,19 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
-install -pm 644 %{SOURCE2} src/autoload.php
-
 
 %build
-# Nothing
+: Create autoloader
+cat <<'AUTOLOAD' | tee src/autoload.php
+<?php
+/* Autoloader for %{name} and its dependencies */
+require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
+
+\Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\', __DIR__);
+AUTOLOAD
 
 
 %install
-
 # Restore PSR-0 tree
 mkdir -p   %{buildroot}%{_datadir}/php/%{ns_vendor}
 cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}
@@ -103,10 +105,7 @@ require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php';
 require_once '%{_datadir}/php/Mockery/autoload.php';
 
 // Test suite
-require_once '%{_datadir}/php/Symfony/Component/ClassLoader/Psr4ClassLoader.php';
-$Loader = new \Symfony\Component\ClassLoader\Psr4ClassLoader();
-$Loader->addPrefix("League\\Flysystem\\Stub\\", dirname(__DIR__).'/stub');
-$Loader->register();
+\Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\Stub\\', dirname(__DIR__).'/stub');
 EOF
 
 : Fix bootstraping
@@ -119,9 +118,15 @@ then PHPSPEC=/dev/null
 else PHPSPEC=%{_bindir}/phpspec
 fi
 
-: Run upstream test suite
-%{_bindir}/php $PHPSPEC run
-%{_bindir}/phpunit --verbose
+ret=0
+for cmd in php php56 php70 php71 php72; do
+  if which $cmd; then
+   : Run upstream test suite with PHP 5
+   $cmd $PHPSPEC run || ret=1
+   $cmd %{_bindir}/phpunit --verbose || ret=1
+  fi
+done
+exit $ret
 
 
 %files
@@ -133,6 +138,31 @@ fi
 
 
 %changelog
+* Mon Aug  7 2017 Remi Collet <remi@remirepo.net> - 1.0.41-1
+- Update to 1.0.41
+
+* Fri Apr 28 2017 Remi Collet <remi@remirepo.net> - 1.0.40-1
+- Update to 1.0.40
+
+* Wed Apr 26 2017 Remi Collet <remi@remirepo.net> - 1.0.39-1
+- Update to 1.0.39
+
+* Mon Apr 24 2017 Remi Collet <remi@remirepo.net> - 1.0.38-1
+- Update to 1.0.38
+
+* Thu Mar 23 2017 Remi Collet <remi@remirepo.net> - 1.0.37-1
+- Update to 1.0.37
+
+* Mon Mar 20 2017 Remi Collet <remi@remirepo.net> - 1.0.36-1
+- Update to 1.0.36
+
+* Thu Feb  9 2017 Remi Collet <remi@fedoraproject.org> - 1.0.35-1
+- update to 1.0.35
+
+* Wed Feb  1 2017 Remi Collet <remi@fedoraproject.org> - 1.0.34-1
+- update to 1.0.34
+- switch to fedora/autoloader
+
 * Wed Oct 19 2016 Remi Collet <remi@fedoraproject.org> - 1.0.30-1
 - update to 1.0.30
 - lower dependency on PHP 5.5.9
diff --git a/sources b/sources
index e09b237..af41112 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de002feb9667b1c31f18b5f67d4291cf  php-league-flysystem-1.0.31-521a233.tgz
+SHA512 (php-league-flysystem-1.0.41-f400aa9.tgz) = af96dfe42050e53a985d8056da9da91f5c359cd4df2d77623dd9f8885c8feabe320c6e062362f5d54c82aecbbcc5493d17ad940446f83843ac2847651b093962