diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d502a650..32aaabedd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Bumped the versions for laminas/diactoros and psr/http-message to support 
+PSR-7 v2.0 (PR #1339)
 
 ## [8.5.1] - released 2023-04-04
 ### Fixed
diff --git a/composer.json b/composer.json
index 24684a273..43dee449c 100644
--- a/composer.json
+++ b/composer.json
@@ -9,13 +9,13 @@
         "league/event": "^2.2",
         "league/uri": "^6.7",
         "lcobucci/jwt": "^4.3 || ^5.0",
-        "psr/http-message": "^1.0.1",
+        "psr/http-message": "^1.0.1 || ^2.0",
         "defuse/php-encryption": "^2.3",
         "lcobucci/clock": "^2.2 || ^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6.6",
-        "laminas/laminas-diactoros": "^2.24.0",
+        "laminas/laminas-diactoros": "^3.0.0",
         "phpstan/phpstan": "^0.12.57",
         "phpstan/phpstan-phpunit": "^0.12.16",
         "roave/security-advisories": "dev-master"