diff --git a/contrib/src/nginx/SHA512SUMS b/contrib/src/nginx/SHA512SUMS
index 4d1d265..8e6d984 100644
--- a/contrib/src/nginx/SHA512SUMS
+++ b/contrib/src/nginx/SHA512SUMS
@@ -36,3 +36,4 @@
 da548dc459f7a921e2f6ea54f543496244e820acbdf3effc4db331717f69b710181fbfdac3be101cd7d1c39e3ca37a94f9a9c4017f11da843ed85a34acf26bc2  nginx-1.19.8.tar.gz
 a418aa22046f641afd95ee661c77c469d21c9957aa5ab74c4186526fcd18e0d701ee933a76ab143081b4b3f8815484074c2609aa257646218bf6b4b739b3cb88  nginx-1.19.9.tar.gz
 aa5b6e94d06e450358f105982a64b8498d1872c0e9b6f05b96b5a7057bdccc9b8078a781bc947e7a1c87737b20ec207de822e7992a25875a548a4b3ea3ae8eea  nginx-1.19.10.tar.gz
+1f0c790e5ba104278ef5fc357e60ba2fddd2d8abda1363e26b418324b050f0e9f4901ce23949adede699e9f1340e8480ad8a6c811b7420a74c8f5c101be8a7ad  nginx-1.21.0.tar.gz
diff --git a/contrib/src/nginx/version b/contrib/src/nginx/version
index 95e117d..de2d0c4 100644
--- a/contrib/src/nginx/version
+++ b/contrib/src/nginx/version
@@ -1,2 +1,2 @@
-NGINX_VERSION := 1.19.10
+NGINX_VERSION := 1.21.0
 NGINX_PLUS_VERSION := 24
diff --git a/docs/nginx-module-auth-spnego.xml b/docs/nginx-module-auth-spnego.xml
index dc7a247..76bd604 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.0"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-auth-spnego" ver="1.1.0" rev="1" basever="1.19.10"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-brotli.xml b/docs/nginx-module-brotli.xml
index e8d759c..1771cc1 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.0"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-brotli" ver="1.0.0" rev="1" basever="1.19.10"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-encrypted-session.xml b/docs/nginx-module-encrypted-session.xml
index 2caa8f3..4d81967 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.0"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-encrypted-session" ver="0.08" rev="1" basever="1.19.10"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-fips-check.xml b/docs/nginx-module-fips-check.xml
index a0225e6..4e041ea 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.0"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-fips-check" ver="0.1" rev="1" basever="1.19.10"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-geoip.xml b/docs/nginx-module-geoip.xml
index 33c5694..c3ef2a0 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.0" rev="1"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-geoip" ver="1.19.10" rev="1"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-geoip2.xml b/docs/nginx-module-geoip2.xml
index 1b447ea..3ac6c8c 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.0"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-geoip2" ver="3.3" rev="1" basever="1.19.10"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-headers-more.xml b/docs/nginx-module-headers-more.xml
index d6dafc7..af898de 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.0"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-headers-more" ver="0.33" rev="1" basever="1.19.10"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-image-filter.xml b/docs/nginx-module-image-filter.xml
index a27e1a8..c7b4386 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.0" rev="1"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-image-filter" ver="1.19.10" rev="1"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-lua.xml b/docs/nginx-module-lua.xml
index e6aa2e0..6c342f2 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.0"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-lua" ver="0.10.19" rev="1" basever="1.19.10"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-modsecurity.xml b/docs/nginx-module-modsecurity.xml
index 779febd..35a98f7 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.1" rev="1" basever="1.21.0"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-modsecurity" ver="1.0.1" rev="1" basever="1.19.10"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-ndk.xml b/docs/nginx-module-ndk.xml
index 833cc3c..f1321e0 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.0"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-ndk" ver="0.3.1" rev="1" basever="1.19.10"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-njs.xml b/docs/nginx-module-njs.xml
index 248c6d3..c1e1ede 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.5.3" rev="1" basever="1.21.0"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-njs" ver="0.5.3" rev="1" basever="1.19.10"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-opentracing.xml b/docs/nginx-module-opentracing.xml
index 3e55197..1aa0de3 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.0"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-opentracing" ver="0.14.0" rev="1" basever="1.19.10"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-passenger.xml b/docs/nginx-module-passenger.xml
index 4c02beb..0bd168d 100644
--- a/docs/nginx-module-passenger.xml
+++ b/docs/nginx-module-passenger.xml
@@ -4,6 +4,18 @@
 
 <change_log title="nginx_module_passenger">
 
+
+<changes apply="nginx-module-passenger" ver="6.0.8" rev="1" basever="1.21.0"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
 <changes apply="nginx-module-passenger" ver="6.0.8" rev="1" basever="1.19.10"
          date="2021-04-15" time="18:40:44 +0300"
          packager="Igor Ippolitov &lt;iippolitov@nginx.com&gt;">
diff --git a/docs/nginx-module-perl.xml b/docs/nginx-module-perl.xml
index 78a1f8a..37905a7 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.0" rev="1"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-perl" ver="1.19.10" rev="1"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-rtmp.xml b/docs/nginx-module-rtmp.xml
index 8c92ed5..a6af1da 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.1" rev="1" basever="1.21.0"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-rtmp" ver="1.2.1" rev="1" basever="1.19.10"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-set-misc.xml b/docs/nginx-module-set-misc.xml
index f1118b6..0d7c19d 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.0"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-set-misc" ver="0.32" rev="1" basever="1.19.10"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-subs-filter.xml b/docs/nginx-module-subs-filter.xml
index adf5216..515133d 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.0"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-subs-filter" ver="0.6.4" rev="1" basever="1.19.10"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx-module-xslt.xml b/docs/nginx-module-xslt.xml
index 0dc87c5..53f9e92 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.0" rev="1"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-xslt" ver="1.19.10" rev="1"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/docs/nginx.xml b/docs/nginx.xml
index e49fc5f..55b6c52 100644
--- a/docs/nginx.xml
+++ b/docs/nginx.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx">
 
 
+<changes apply="nginx" ver="1.21.0" rev="1"
+         date="2021-05-25" time="16:01:22 +0300"
+         packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+<change>
+<para>
+1.21.0-1
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx" ver="1.19.10" rev="1"
          date="2021-04-13" time="18:40:44 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">