diff --git a/.gitignore b/.gitignore
index 06d6f30..9cca214 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /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
+/php-mtdowling-jmespath-php-2.5.0-52168cb9472de06979613d365c7f1ab8798be895.tar.gz
diff --git a/composer.json b/composer.json
index 79a2c5e..8ae5bb0 100644
--- a/composer.json
+++ b/composer.json
@@ -13,11 +13,13 @@
   ],
 
   "require": {
-    "php": ">=5.4.0"
+    "php": ">=5.4.0",
+    "symfony/polyfill-mbstring": "^1.4"
   },
 
   "require-dev": {
-    "phpunit/phpunit": "~4.0"
+    "composer/xdebug-handler": "^1.2",
+    "phpunit/phpunit": "^4.8.36|^7.5.15"
   },
 
   "autoload": {
@@ -31,7 +33,7 @@
 
   "extra": {
     "branch-alias": {
-      "dev-master": "2.0-dev"
+      "dev-master": "2.5-dev"
     }
   }
 }
diff --git a/php-mtdowling-jmespath-php.spec b/php-mtdowling-jmespath-php.spec
index 60c7f71..82f1e93 100644
--- a/php-mtdowling-jmespath-php.spec
+++ b/php-mtdowling-jmespath-php.spec
@@ -1,7 +1,7 @@
 #
 # Fedora spec file for php-mtdowling-jmespath-php
 #
-# Copyright (c) 2015-2016 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2015-2020 Shawn Iwinski <shawn.iwinski@gmail.com>
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -11,8 +11,8 @@
 
 %global github_owner     jmespath
 %global github_name      jmespath.php
-%global github_version   2.4.0
-%global github_commit    adcc9531682cf87dfda21e1fd5d0e7a41d292fac
+%global github_version   2.5.0
+%global github_commit    52168cb9472de06979613d365c7f1ab8798be895
 
 %global composer_vendor  mtdowling
 %global composer_project jmespath.php
@@ -27,7 +27,7 @@
 
 Name:          php-%{composer_vendor}-jmespath-php
 Version:       %{github_version}
-Release:       8%{?github_release}%{?dist}
+Release:       1%{?github_release}%{?dist}
 Summary:       Declaratively specify how to extract elements from a JSON document
 
 License:       MIT
@@ -40,8 +40,9 @@ BuildArch:     noarch
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: php-composer(phpunit/phpunit)
-## phpcompatinfo (computed from version 2.4.0)
+## phpcompatinfo (computed from version 2.5.0)
 BuildRequires: php-json
+BuildRequires: php-mbstring
 BuildRequires: php-spl
 ## Autoloader
 BuildRequires: php-composer(fedora/autoloader)
@@ -50,14 +51,15 @@ BuildRequires: php-composer(fedora/autoloader)
 Requires:      php-cli
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
-# phpcompatinfo (computed from version 2.4.0)
+# phpcompatinfo (computed from version 2.5.0)
 Requires:      php-json
+Requires:      php-mbstring
 Requires:      php-spl
 # Autoloader
 Requires:      php-composer(fedora/autoloader)
 
 # php-{COMPOSER_VENDOR}-{COMPOSER_PROJECT}
-Provides:      php-%{composer_vendor}-%{composer_project}           = %{version}-%{release}
+Provides:      php-%{composer_vendor}-%{composer_project} = %{version}-%{release}
 # Composer
 Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
 
@@ -128,6 +130,9 @@ sed 's/function testTokenizesJsonNumbers/function SKIP_testTokenizesJsonNumbers/
 
 
 %changelog
+* Wed Feb 12 2020 Shawn Iwinski <shawn.iwinski@gmail.com> - 2.5.0-1
+- Update to 2.5.0 (RHBZ #1787856)
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 67b7921..0dbcc8b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-994943f6ec3ea78111c9218efdca07e8  php-mtdowling-jmespath-php-2.4.0-adcc9531682cf87dfda21e1fd5d0e7a41d292fac.tar.gz
+SHA512 (php-mtdowling-jmespath-php-2.5.0-52168cb9472de06979613d365c7f1ab8798be895.tar.gz) = ff80c15398d2f66ae466f6c546ab93a6e9f0e18d0f335404605c2df5e4d59ce003c7d57577faf3afcea004a9add63adc0f2e38ed2ba490b6c925ffe224db8668