diff --git a/CHANGES b/CHANGES
index 50bc9dcf5c..3c00f7e1cf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6015.	[bug]		Some browsers (Firefox) send more than 10 HTTP
+			headers.  Bump the number of allowed HTTP headers
+			to 100. [GL #3670]
+
 6014.	[func]		Add isc_hashmap API implementation that implements
 			Robin Hood hashing.  The API requires the keys to
 			be stored with the stored value.  [GL !6790]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 6be7563b9e..b689ac2d9c 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -35,7 +35,9 @@ Feature Changes
 Bug Fixes
 ~~~~~~~~~
 
-- None.
+- Increase the number of HTTP headers in the statistics channel from
+  10 to 100 to accomodate for some browsers that send more that 10
+  headers by default. :gl:`#3670`
 
 Known Issues
 ~~~~~~~~~~~~
diff --git a/lib/isc/httpd.c b/lib/isc/httpd.c
index aee63f8a93..c91847088d 100644
--- a/lib/isc/httpd.c
+++ b/lib/isc/httpd.c
@@ -51,7 +51,7 @@
  */
 #define HTTP_RECVLEN	     ISC_NETMGR_TCP_RECVBUF_SIZE * 2
 #define HTTP_SENDLEN	     ISC_NETMGR_TCP_RECVBUF_SIZE
-#define HTTP_HEADERS_NUM     10
+#define HTTP_HEADERS_NUM     100
 #define HTTP_MAX_REQUEST_LEN 4096
 
 #define HTTPD_CLOSE	     0x0001 /* Got a Connection: close header */