diff --git a/contrib/src/nginx/SHA512SUMS b/contrib/src/nginx/SHA512SUMS
index 6229adf..e0ae931 100644
--- a/contrib/src/nginx/SHA512SUMS
+++ b/contrib/src/nginx/SHA512SUMS
@@ -40,3 +40,4 @@
 4fee94e9981abf4506cc3a24053828e81c763e98a3704b1cc54944cf09b49269a04495aca154b2dc6e065551d60f3f9f219659e93056b67952ecf8d07f9fcd98  nginx-1.21.1.tar.gz
 5fa9c8f3a1bd9366b30de2bdbbd5baef47381e6d8672341ed601116baeb077ea1b596716ca06ec03d8a2773a437b78acd408084e49ba239f74de915f1b7fb8a5  nginx-1.21.2.tar.gz
 173d6d5c1471df1f5fbcf43fab19699ac509faee44a6c603f5e96ba59ac58774bbd84be5b45f5922a12b4037e4b32f875ce71c28e3e6adb70f306a2d25b40736  nginx-1.21.3.tar.gz
+8f0be700bbec70abdb9902c27044334038087d03bdf07b9bdf1520f416edd12ca504bdd0244b34c542b222c28d5bd2d0add54dcb04b235e763d088fa3e2cee6e  nginx-1.21.4.tar.gz
diff --git a/contrib/src/nginx/version b/contrib/src/nginx/version
index d94e556..87541a6 100644
--- a/contrib/src/nginx/version
+++ b/contrib/src/nginx/version
@@ -1,2 +1,2 @@
-NGINX_VERSION := 1.21.3
+NGINX_VERSION := 1.21.4
 NGINX_PLUS_VERSION := 25
diff --git a/docs/nginx-module-auth-spnego.xml b/docs/nginx-module-auth-spnego.xml
index dffa2f2..a4e6b46 100644
--- a/docs/nginx-module-auth-spnego.xml
+++ b/docs/nginx-module-auth-spnego.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_auth_spnego">
 
 
+<changes apply="nginx-module-auth-spnego" ver="1.1.0" rev="1" basever="1.21.4"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-auth-spnego" ver="1.1.0" rev="1" basever="1.21.3"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-brotli.xml b/docs/nginx-module-brotli.xml
index a8972b8..71ef472 100644
--- a/docs/nginx-module-brotli.xml
+++ b/docs/nginx-module-brotli.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_brotli">
 
 
+<changes apply="nginx-module-brotli" ver="1.0.0" rev="1" basever="1.21.4"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-brotli" ver="1.0.0" rev="1" basever="1.21.3"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-encrypted-session.xml b/docs/nginx-module-encrypted-session.xml
index da9aa25..8a4dab3 100644
--- a/docs/nginx-module-encrypted-session.xml
+++ b/docs/nginx-module-encrypted-session.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_encrypted_session">
 
 
+<changes apply="nginx-module-encrypted-session" ver="0.08" rev="1" basever="1.21.4"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-encrypted-session" ver="0.08" rev="1" basever="1.21.3"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-fips-check.xml b/docs/nginx-module-fips-check.xml
index 60cce39..9d65bb2 100644
--- a/docs/nginx-module-fips-check.xml
+++ b/docs/nginx-module-fips-check.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_fips_check">
 
 
+<changes apply="nginx-module-fips-check" ver="0.1" rev="1" basever="1.21.4"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-fips-check" ver="0.1" rev="1" basever="1.21.3"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-geoip.xml b/docs/nginx-module-geoip.xml
index d4db5c2..cb56cee 100644
--- a/docs/nginx-module-geoip.xml
+++ b/docs/nginx-module-geoip.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_geoip">
 
 
+<changes apply="nginx-module-geoip" ver="1.21.4" rev="1"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-geoip" ver="1.21.3" rev="1"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-geoip2.xml b/docs/nginx-module-geoip2.xml
index 592915a..5ac7716 100644
--- a/docs/nginx-module-geoip2.xml
+++ b/docs/nginx-module-geoip2.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_geoip2">
 
 
+<changes apply="nginx-module-geoip2" ver="3.3" rev="1" basever="1.21.4"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-geoip2" ver="3.3" rev="1" basever="1.21.3"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-headers-more.xml b/docs/nginx-module-headers-more.xml
index e284faf..8535b96 100644
--- a/docs/nginx-module-headers-more.xml
+++ b/docs/nginx-module-headers-more.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_headers_more">
 
 
+<changes apply="nginx-module-headers-more" ver="0.33" rev="1" basever="1.21.4"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-headers-more" ver="0.33" rev="1" basever="1.21.3"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-image-filter.xml b/docs/nginx-module-image-filter.xml
index 081e912..5896f27 100644
--- a/docs/nginx-module-image-filter.xml
+++ b/docs/nginx-module-image-filter.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_image_filter">
 
 
+<changes apply="nginx-module-image-filter" ver="1.21.4" rev="1"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-image-filter" ver="1.21.3" rev="1"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-lua.xml b/docs/nginx-module-lua.xml
index bfd3bb7..81786ee 100644
--- a/docs/nginx-module-lua.xml
+++ b/docs/nginx-module-lua.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_lua">
 
 
+<changes apply="nginx-module-lua" ver="0.10.19" rev="1" basever="1.21.4"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-lua" ver="0.10.19" rev="1" basever="1.21.3"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-modsecurity.xml b/docs/nginx-module-modsecurity.xml
index 21666a6..7edd608 100644
--- a/docs/nginx-module-modsecurity.xml
+++ b/docs/nginx-module-modsecurity.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_modsecurity">
 
 
+<changes apply="nginx-module-modsecurity" ver="1.0.2" rev="1" basever="1.21.4"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-modsecurity" ver="1.0.2" rev="1" basever="1.21.3"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-ndk.xml b/docs/nginx-module-ndk.xml
index 04256c3..9aeabac 100644
--- a/docs/nginx-module-ndk.xml
+++ b/docs/nginx-module-ndk.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_ndk">
 
 
+<changes apply="nginx-module-ndk" ver="0.3.1" rev="1" basever="1.21.4"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-ndk" ver="0.3.1" rev="1" basever="1.21.3"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-njs.xml b/docs/nginx-module-njs.xml
index 17d2920..91d3448 100644
--- a/docs/nginx-module-njs.xml
+++ b/docs/nginx-module-njs.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_njs">
 
 
+<changes apply="nginx-module-njs" ver="0.7.0" rev="1" basever="1.21.4"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-njs" ver="0.7.0" rev="1" basever="1.21.3"
          date="2021-10-19" time="17:44:05 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-opentracing.xml b/docs/nginx-module-opentracing.xml
index fa8f8aa..1597b30 100644
--- a/docs/nginx-module-opentracing.xml
+++ b/docs/nginx-module-opentracing.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_opentracing">
 
 
+<changes apply="nginx-module-opentracing" ver="0.14.0" rev="1" basever="1.21.4"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-opentracing" ver="0.14.0" rev="1" basever="1.21.3"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-passenger.xml b/docs/nginx-module-passenger.xml
index b48a0b0..7fabdcd 100644
--- a/docs/nginx-module-passenger.xml
+++ b/docs/nginx-module-passenger.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_passenger">
 
 
+<changes apply="nginx-module-passenger" ver="6.0.8" rev="1" basever="1.21.4"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-passenger" ver="6.0.8" rev="1" basever="1.21.3"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-perl.xml b/docs/nginx-module-perl.xml
index e940c1f..b21acbb 100644
--- a/docs/nginx-module-perl.xml
+++ b/docs/nginx-module-perl.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_perl">
 
 
+<changes apply="nginx-module-perl" ver="1.21.4" rev="1"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-perl" ver="1.21.3" rev="1"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-rtmp.xml b/docs/nginx-module-rtmp.xml
index 17056c0..917d75f 100644
--- a/docs/nginx-module-rtmp.xml
+++ b/docs/nginx-module-rtmp.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_rtmp">
 
 
+<changes apply="nginx-module-rtmp" ver="1.2.2" rev="1" basever="1.21.4"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-rtmp" ver="1.2.2" rev="1" basever="1.21.3"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-set-misc.xml b/docs/nginx-module-set-misc.xml
index 7c6cc92..543fdc5 100644
--- a/docs/nginx-module-set-misc.xml
+++ b/docs/nginx-module-set-misc.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_set_misc">
 
 
+<changes apply="nginx-module-set-misc" ver="0.32" rev="1" basever="1.21.4"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-set-misc" ver="0.32" rev="1" basever="1.21.3"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-subs-filter.xml b/docs/nginx-module-subs-filter.xml
index ec40557..e524814 100644
--- a/docs/nginx-module-subs-filter.xml
+++ b/docs/nginx-module-subs-filter.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_subs_filter">
 
 
+<changes apply="nginx-module-subs-filter" ver="0.6.4" rev="1" basever="1.21.4"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-subs-filter" ver="0.6.4" rev="1" basever="1.21.3"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-xslt.xml b/docs/nginx-module-xslt.xml
index 68faf58..cbd859a 100644
--- a/docs/nginx-module-xslt.xml
+++ b/docs/nginx-module-xslt.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx_module_xslt">
 
 
+<changes apply="nginx-module-xslt" ver="1.21.4" rev="1"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-xslt" ver="1.21.3" rev="1"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx.xml b/docs/nginx.xml
index e1c59c1..e7a6b8e 100644
--- a/docs/nginx.xml
+++ b/docs/nginx.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx">
 
 
+<changes apply="nginx" ver="1.21.4" rev="1"
+         date="2021-11-02" time="18:01:49 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+1.21.4-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx" ver="1.21.3" rev="1"
          date="2021-09-07" time="18:38:16 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">