diff --git a/.gitignore b/.gitignore
index d721058..099f186 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clog
 /php-phpseclib-2.0.2-3d265f7.tgz
 /php-phpseclib.spec
 /php-phpseclib-2.0.4-ab8028c.tgz
+/php-phpseclib-2.0.5-f8dd0e1.tgz
diff --git a/php-phpseclib-autoload.php b/php-phpseclib-autoload.php
index 4367aa0..93e0f67 100644
--- a/php-phpseclib-autoload.php
+++ b/php-phpseclib-autoload.php
@@ -3,22 +3,9 @@
 /**
  * Autoloader for phpseclib/phpseclib.
  */
-$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';
-    }
-
-    $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
-    $fedoraClassLoader->register();
-}
+require_once "/usr/share/php/Fedora/Autoloader/autoload.php";
 
 // composer.json: "autoload": { "files": [ "phpseclib/bootstrap.php" ], "psr-4": { "phpseclib\\": "phpseclib/" }
 require_once __DIR__ . '/bootstrap.php';
-
-$fedoraClassLoader->addPrefixes(array(
-    'phpseclib' => dirname(__DIR__),
-));
+\Fedora\Autoloader\Autoload::addPsr4('phpseclib\\', __DIR__);
 
diff --git a/php-phpseclib.spec b/php-phpseclib.spec
index f81ad98..54e4bbd 100644
--- a/php-phpseclib.spec
+++ b/php-phpseclib.spec
@@ -3,17 +3,13 @@
 
 %global github_owner            phpseclib
 %global github_name             phpseclib
-%global github_commit           ab8028c93c03cc8d9c824efa75dc94f1db2369bf
+%global github_commit           f8dd0e18d2328c447dd4190fecd11ef52680d968
 %global github_short            %(c=%{github_commit}; echo ${c:0:7})
-%if 0%{?rhel} == 5
-%global with_tests              0%{?_with_tests:1}
-%else
 %global with_tests              0%{!?_without_tests:1}
-%endif
 
 Name:       php-%{composer_vendor}
-Version:    2.0.4
-Release:    2%{?dist}
+Version:    2.0.5
+Release:    1%{?dist}
 Summary:    PHP Secure Communications Library
 
 Group:      System Environment/Libraries
@@ -27,7 +23,7 @@ Source2:    makesrc.sh
 BuildArch:      noarch
 
 %if %{with_tests}
-BuildRequires:  php-composer(symfony/class-loader)
+BuildRequires:  php-composer(fedora/autoloader)
 BuildRequires:  %{_bindir}/phpunit
 BuildRequires:  %{_bindir}/phpab
 # Optional at runtime, to avoid too muck skipped tests
@@ -46,7 +42,8 @@ Requires:   php-pcre
 Requires:   php-session
 Requires:   php-standard
 Requires:   php-xml
-Requires:   php-composer(symfony/class-loader)
+# Autoloader
+Requires:   php-composer(fedora/autoloader)
 
 Provides:   php-composer(%{composer_vendor}/%{composer_project}) = %{version}
 
@@ -56,22 +53,35 @@ MIT-licensed pure-PHP implementations of an arbitrary-precision integer
 arithmetic library, fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4, 
 Rijndael, AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509
 
+
 %prep
 %setup -qn %{github_name}-%{github_commit}
 cp %{SOURCE1} %{composer_vendor}/autoload.php
 
+# https://github.com/phpseclib/phpseclib/pull/1121
+chmod -x phpseclib/Net/SCP.php
+
+
 %build
 
+
 %install
 mkdir -p %{buildroot}%{_datadir}/php
 cp -pr %{composer_vendor} %{buildroot}%{_datadir}/php
 
+
 %if %{with_tests}
 %check
 %{_bindir}/phpab --output tests/bootstrap.php tests
 echo 'require "%{buildroot}%{_datadir}/php/%{composer_vendor}/autoload.php";' >> tests/bootstrap.php
 
-%{_bindir}/phpunit --verbose
+ret=0
+for cmd in php php70 php71 php72; do
+  if which $cmd; then
+    $cmd %{_bindir}/phpunit || ret=1
+  fi
+done
+exit $ret
 %endif
 
 
@@ -83,6 +93,13 @@ echo 'require "%{buildroot}%{_datadir}/php/%{composer_vendor}/autoload.php";' >>
 
 
 %changelog
+* Mon May  8 2017 Remi Collet <remi@remirepo.net> - 2.0.5-1
+- Update to 2.0.5
+- switch to fedora/autoloader
+- use SCL of PHP when available for test suite
+- open https://github.com/phpseclib/phpseclib/issues/1122 - regression with 5.3
+- open https://github.com/phpseclib/phpseclib/pull/1121 - fix permission
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 1894e97..ada3fce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-93b5fb794ed0363412eee9e1a0c3528b  php-phpseclib-2.0.4-ab8028c.tgz
+SHA512 (php-phpseclib-2.0.5-f8dd0e1.tgz) = a9a6b25e742a5422726d6b055a6a679d73a70d7f82c30f77b21d4b9a4c987759b303da676a231501511f50cd80eac37a83c109db40c939dd93beec8ac8a1fd7d