diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index 797cde99b..1eaccfb2e 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -1,7 +1,11 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+### Added
+* Add timeout for canceling HTTP/2 server side connection handshake. Default to 5 seconds. [#2483]
+* HTTP/2 handshake timeout can be configured with `ServiceConfig::client_timeout`. [#2483] 
 
+[#2483]: https://github.com/actix/actix-web/pull/2483
 
 ## 3.0.0-beta.14 - 2021-11-30
 ### Changed
diff --git a/actix-http/tests/test_h2_timer.rs b/actix-http/tests/test_h2_timer.rs
index 916129662..2b9c26e4a 100644
--- a/actix-http/tests/test_h2_timer.rs
+++ b/actix-http/tests/test_h2_timer.rs
@@ -93,7 +93,7 @@ async fn h2_handshake_timeout() -> io::Result<()> {
                 .listen("h2_ping_pong", lst, || {
                     HttpService::build()
                         .keep_alive(30)
-                        // set first request timeout to 3 seconds.
+                        // set first request timeout to 5 seconds.
                         // this is the timeout used for http2 handshake.
                         .client_timeout(5000)
                         .h2(|_| async { Ok::<_, Error>(Response::ok()) })