diff --git a/doc/configuration.txt b/doc/configuration.txt
index 927c97ce3..183710c35 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2744,7 +2744,7 @@ tune.h2.initial-window-size <number>
   Sets the HTTP/2 initial window size, which is the number of bytes the client
   can upload before waiting for an acknowledgment from HAProxy. This setting
   only affects payload contents (i.e. the body of POST requests), not headers.
-  The default value is 65535, which roughly allows up to 5 Mbps of upload
+  The default value is 65536, which roughly allows up to 5 Mbps of upload
   bandwidth per client over a network showing a 100 ms ping time, or 500 Mbps
   over a 1-ms local network. It can make sense to increase this value to allow
   faster uploads, or to reduce it to increase fairness when dealing with many
diff --git a/src/mux_h2.c b/src/mux_h2.c
index 4b615fc89..cd3b5799c 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -518,7 +518,7 @@ DECLARE_STATIC_POOL(pool_head_h2s, "h2s", sizeof(struct h2s));
 
 /* a few settings from the global section */
 static int h2_settings_header_table_size      =  4096; /* initial value */
-static int h2_settings_initial_window_size    = 65535; /* initial value */
+static int h2_settings_initial_window_size    = 65536; /* initial value */
 static unsigned int h2_settings_max_concurrent_streams = 100;
 static int h2_settings_max_frame_size         = 0;     /* unset */