diff --git a/.gitignore b/.gitignore
index 4b203a8..06d6f30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /php-mtdowling-jmespath-php-2.1.0-88b6d646de963396dd227d028cce114fe85f9857.tar.gz
 /php-mtdowling-jmespath-php-2.2.0-a7d99d0c836e69d27b7bfca1d33ca2759fba3289.tar.gz
 /php-mtdowling-jmespath-php-2.3.0-192f93e43c2c97acde7694993ab171b3de284093.tar.gz
+/php-mtdowling-jmespath-php-2.4.0-adcc9531682cf87dfda21e1fd5d0e7a41d292fac.tar.gz
diff --git a/php-mtdowling-jmespath-php.spec b/php-mtdowling-jmespath-php.spec
index ba6f874..07bd613 100644
--- a/php-mtdowling-jmespath-php.spec
+++ b/php-mtdowling-jmespath-php.spec
@@ -11,8 +11,8 @@
 
 %global github_owner     jmespath
 %global github_name      jmespath.php
-%global github_version   2.3.0
-%global github_commit    192f93e43c2c97acde7694993ab171b3de284093
+%global github_version   2.4.0
+%global github_commit    adcc9531682cf87dfda21e1fd5d0e7a41d292fac
 
 %global composer_vendor  mtdowling
 %global composer_project jmespath.php
@@ -27,7 +27,7 @@
 
 Name:          php-%{composer_vendor}-jmespath-php
 Version:       %{github_version}
-Release:       2%{?github_release}%{?dist}
+Release:       1%{?github_release}%{?dist}
 Summary:       Declaratively specify how to extract elements from a JSON document
 
 Group:         Development/Libraries
@@ -41,21 +41,21 @@ BuildArch:     noarch
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: php-composer(phpunit/phpunit)
-## phpcompatinfo (computed from version 2.3.0)
+## phpcompatinfo (computed from version 2.4.0)
 BuildRequires: php-json
 BuildRequires: php-spl
 ## Autoloader
-BuildRequires: php-composer(symfony/class-loader)
+BuildRequires: php-composer(fedora/autoloader)
 %endif
 
 Requires:      php-cli
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
-# phpcompatinfo (computed from version 2.3.0)
+# phpcompatinfo (computed from version 2.4.0)
 Requires:      php-json
 Requires:      php-spl
 # Autoloader
-Requires:      php-composer(symfony/class-loader)
+Requires:      php-composer(fedora/autoloader)
 
 # php-{COMPOSER_VENDOR}-{COMPOSER_PROJECT}
 Provides:      php-%{composer_vendor}-%{composer_project}           = %{version}-%{release}
@@ -77,24 +77,12 @@ cat <<'AUTOLOAD' | tee src/autoload.php
 /**
  * Autoloader for %{name} and its' dependencies
  * (created by %{name}-%{version}-%{release}).
- *
- * @return \Symfony\Component\ClassLoader\ClassLoader
  */
+require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 
-if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
-    if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
-        require_once '%{phpdir}/Symfony/Component/ClassLoader/ClassLoader.php';
-    }
-
-    $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
-    $fedoraClassLoader->register();
-}
-
-$fedoraClassLoader->addPrefix('JmesPath\\', dirname(__DIR__));
+\Fedora\Autoloader\Autoload::addPsr4('JmesPath\\', __DIR__);
 
 require_once __DIR__ . '/JmesPath.php';
-
-return $fedoraClassLoader;
 AUTOLOAD
 
 : Modify bin script
@@ -141,6 +129,11 @@ sed 's/function testTokenizesJsonNumbers/function SKIP_testTokenizesJsonNumbers/
 
 
 %changelog
+* Wed Dec 07 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 2.4.0-1
+- Update to 2.4.0 (RHBZ #1401271)
+- Change autoloader from php-composer(symfony/class-loader) to
+  php-composer(fedora/autoloader)
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 5288d77..67b7921 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13a3ae970f2cfe7ee000c5c6c5f6993b  php-mtdowling-jmespath-php-2.3.0-192f93e43c2c97acde7694993ab171b3de284093.tar.gz
+994943f6ec3ea78111c9218efdca07e8  php-mtdowling-jmespath-php-2.4.0-adcc9531682cf87dfda21e1fd5d0e7a41d292fac.tar.gz