diff --git a/mod_fcgid-2.3.9-1024-env-vars.patch b/mod_fcgid-2.3.9-1024-env-vars.patch
new file mode 100644
index 0000000..5c4cd88
--- /dev/null
+++ b/mod_fcgid-2.3.9-1024-env-vars.patch
@@ -0,0 +1,13 @@
+diff --git a/modules/fcgid/fcgid_conf.h b/modules/fcgid/fcgid_conf.h
+index 60aeee8..f803a6e 100644
+--- a/modules/fcgid/fcgid_conf.h
++++ b/modules/fcgid/fcgid_conf.h
+@@ -139,7 +139,7 @@ typedef struct {
+  */
+ #define INITENV_KEY_LEN 64
+ #define INITENV_VAL_LEN 128
+-#define INITENV_CNT 64
++#define INITENV_CNT 1024
+ typedef struct {
+     char initenv_key[INITENV_CNT][INITENV_KEY_LEN];
+     char initenv_val[INITENV_CNT][INITENV_VAL_LEN];
diff --git a/mod_fcgid.spec b/mod_fcgid.spec
index bbc947f..9267d0f 100644
--- a/mod_fcgid.spec
+++ b/mod_fcgid.spec
@@ -1,6 +1,6 @@
 Name:		mod_fcgid
 Version:	2.3.9
-Release:	25%{?dist}
+Release:	26%{?dist}
 Summary:	FastCGI interface module for Apache 2
 License:	ASL 2.0
 URL:		http://httpd.apache.org/mod_fcgid/
@@ -12,6 +12,7 @@ Source5:	fcgid24.conf
 Patch0:		mod_fcgid-2.3.4-fixconf-shellbang.patch
 Patch1:		mod_fcgid-2.3.9-segfault-upload.patch
 Patch2:		mod_fcgid-2.3.9-r1848298.patch
+Patch3:		mod_fcgid-2.3.9-1024-env-vars.patch
 BuildRequires:	coreutils
 BuildRequires:	gcc
 BuildRequires:	httpd-devel >= 2.4
@@ -41,6 +42,7 @@ cp -p %{SOURCE5} fcgid24.conf
 
 %patch1 -p1 -b .segfault_upload
 %patch2 -p1 -b .r1848298
+%patch3 -p1 -b .1024_env_vars
 
 %build
 APXS=%{_httpd_apxs} ./configure.apxs
@@ -74,6 +76,10 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/mod_fcgid.conf
 %dir %attr(0775,root,apache) /run/mod_fcgid/
 
 %changelog
+* Tue May 18 2021 Lubos Uhliarik <luhliari@redhat.com> - 2.3.9-26
+- Resolves: #1958882 - mod_fcgid does not pass more than 64 variables to an FCGI
+  server process environment
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.9-25
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
diff --git a/sources b/sources
index 9bfcf47..ee71316 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-262a8c59bceee5fcb669dd92a85c637d  mod_fcgid-2.3.9.tar.bz2
+SHA512 (mod_fcgid-2.3.9.tar.bz2) = c429c14990cc8b492e88db1aa00fc2593bfb1b129b9001be21670d42c8f3e5038acd3f4556b48f3ac7dfc03c8d3656f0d4402122932e5bdc2c2aab1c7c235121