diff --git a/alpine/Makefile b/alpine/Makefile
index e4afb87..de3f5b6 100644
--- a/alpine/Makefile
+++ b/alpine/Makefile
@@ -1,7 +1,7 @@
 SHELL=		/bin/bash
 
 BASE_VERSION=	1.18.0
-BASE_RELEASE=	1
+BASE_RELEASE=	2
 PLUS_VERSION=	21
 PLUS_RELEASE=	${BASE_RELEASE}
 BASE_SRC=	nginx-$(BASE_VERSION).tar.gz
diff --git a/alpine/Makefile.module-geoip b/alpine/Makefile.module-geoip
index 1b421d7..ba03227 100644
--- a/alpine/Makefile.module-geoip
+++ b/alpine/Makefile.module-geoip
@@ -3,7 +3,7 @@
 MODULE_SUMMARY_geoip=	GeoIP dynamic modules
 
 MODULE_VERSION_geoip=	$(TARGET_VERSION)
-MODULE_RELEASE_geoip=	1
+MODULE_RELEASE_geoip=	2
 
 MODULE_CONFARGS_geoip=	--with-stream \
 			--with-http_geoip_module=dynamic \
diff --git a/alpine/Makefile.module-image-filter b/alpine/Makefile.module-image-filter
index 7c874e6..c085fb7 100644
--- a/alpine/Makefile.module-image-filter
+++ b/alpine/Makefile.module-image-filter
@@ -3,7 +3,7 @@
 MODULE_SUMMARY_image_filter=	image filter dynamic module
 
 MODULE_VERSION_image_filter=	$(TARGET_VERSION)
-MODULE_RELEASE_image_filter=	1
+MODULE_RELEASE_image_filter=	2
 
 MODULE_CONFARGS_image_filter=	--with-http_image_filter_module=dynamic
 
diff --git a/alpine/Makefile.module-njs b/alpine/Makefile.module-njs
index 466f67d..7d98643 100644
--- a/alpine/Makefile.module-njs
+++ b/alpine/Makefile.module-njs
@@ -3,7 +3,7 @@
 MODULE_SUMMARY_njs=		njs dynamic modules
 
 MODULE_VERSION_njs=		0.4.4
-MODULE_RELEASE_njs=		1
+MODULE_RELEASE_njs=		2
 
 MODULE_SOURCES_njs=		njs-$(MODULE_VERSION_njs).tar.gz
 MODULE_CONFARGS_njs=		--with-stream \
diff --git a/alpine/Makefile.module-perl b/alpine/Makefile.module-perl
index 330dd48..43afc75 100644
--- a/alpine/Makefile.module-perl
+++ b/alpine/Makefile.module-perl
@@ -3,7 +3,7 @@
 MODULE_SUMMARY_perl=		Perl dynamic module
 
 MODULE_VERSION_perl=		$(TARGET_VERSION)
-MODULE_RELEASE_perl=		1
+MODULE_RELEASE_perl=		2
 
 MODULE_CONFARGS_perl=		--with-http_perl_module=dynamic
 
diff --git a/alpine/Makefile.module-xslt b/alpine/Makefile.module-xslt
index f4674a1..2abccea 100644
--- a/alpine/Makefile.module-xslt
+++ b/alpine/Makefile.module-xslt
@@ -3,7 +3,7 @@
 MODULE_SUMMARY_xslt=		xslt dynamic module
 
 MODULE_VERSION_xslt=		$(TARGET_VERSION)
-MODULE_RELEASE_xslt=		1
+MODULE_RELEASE_xslt=		2
 
 MODULE_CONFARGS_xslt=		--with-http_xslt_module=dynamic
 
diff --git a/debian/Makefile b/debian/Makefile
index 2312cf3..ec3d074 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -1,7 +1,7 @@
 SHELL=		/bin/bash
 
 BASE_VERSION=	1.18.0
-BASE_RELEASE=	1
+BASE_RELEASE=	2
 PLUS_VERSION=	21
 BASE_SRC=	nginx-$(BASE_VERSION).tar.gz
 SRCDIR=		nginx-$(BASE_VERSION)
diff --git a/debian/Makefile.module-geoip b/debian/Makefile.module-geoip
index 5823ed0..a97a8ea 100644
--- a/debian/Makefile.module-geoip
+++ b/debian/Makefile.module-geoip
@@ -3,7 +3,7 @@
 MODULE_SUMMARY_geoip=	GeoIP dynamic modules
 
 MODULE_VERSION_geoip=	$(TARGET_VERSION)
-MODULE_RELEASE_geoip=	1
+MODULE_RELEASE_geoip=	2
 
 MODULE_CONFARGS_geoip=	--with-http_geoip_module=dynamic \
 			--with-stream_geoip_module=dynamic
diff --git a/debian/Makefile.module-image-filter b/debian/Makefile.module-image-filter
index 5c54ebb..8651a93 100644
--- a/debian/Makefile.module-image-filter
+++ b/debian/Makefile.module-image-filter
@@ -3,7 +3,7 @@
 MODULE_SUMMARY_image_filter=	image filter dynamic module
 
 MODULE_VERSION_image_filter=	$(TARGET_VERSION)
-MODULE_RELEASE_image_filter=	1
+MODULE_RELEASE_image_filter=	2
 
 MODULE_CONFARGS_image_filter=	--with-http_image_filter_module=dynamic
 
diff --git a/debian/Makefile.module-njs b/debian/Makefile.module-njs
index b477557..f50c602 100644
--- a/debian/Makefile.module-njs
+++ b/debian/Makefile.module-njs
@@ -3,7 +3,7 @@
 MODULE_SUMMARY_njs=	njs dynamic modules
 
 MODULE_VERSION_njs=	0.4.4
-MODULE_RELEASE_njs=	1
+MODULE_RELEASE_njs=	2
 
 MODULE_SOURCES_njs=	njs-$(MODULE_VERSION_njs).tar.gz
 
diff --git a/debian/Makefile.module-perl b/debian/Makefile.module-perl
index 50dedfa..f34e513 100644
--- a/debian/Makefile.module-perl
+++ b/debian/Makefile.module-perl
@@ -3,7 +3,7 @@
 MODULE_SUMMARY_perl=	Perl dynamic module
 
 MODULE_VERSION_perl=	$(TARGET_VERSION)
-MODULE_RELEASE_perl=	1
+MODULE_RELEASE_perl=	2
 
 MODULE_CONFARGS_perl=	--with-http_perl_module=dynamic
 
diff --git a/debian/Makefile.module-xslt b/debian/Makefile.module-xslt
index 5e655bb..9e3fc58 100644
--- a/debian/Makefile.module-xslt
+++ b/debian/Makefile.module-xslt
@@ -3,7 +3,7 @@
 MODULE_SUMMARY_xslt=	xslt dynamic module
 
 MODULE_VERSION_xslt=	$(TARGET_VERSION)
-MODULE_RELEASE_xslt=	1
+MODULE_RELEASE_xslt=	2
 
 MODULE_CONFARGS_xslt=	--with-http_xslt_module=dynamic
 
diff --git a/docs/nginx-module-geoip.xml b/docs/nginx-module-geoip.xml
index 5e4d559..8d1394c 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.18.0" rev="2"
+         date="2020-10-29" time="12:59:47 +0300"
+         packager="Andrei Belov &lt;defan@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.18.0-2
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-geoip" ver="1.18.0" rev="1"
          date="2020-04-21" time="15:43:12 +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 a6448e3..c3d28b2 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.18.0" rev="2"
+         date="2020-10-29" time="12:59:47 +0300"
+         packager="Andrei Belov &lt;defan@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.18.0-2
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-image-filter" ver="1.18.0" rev="1"
          date="2020-04-21" time="15:43:12 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-njs.xml b/docs/nginx-module-njs.xml
index 6f7727f..67bd295 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.4.4" rev="2" basever="1.18.0"
+         date="2020-10-29" time="12:59:47 +0300"
+         packager="Andrei Belov &lt;defan@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.18.0-2
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-njs" ver="0.4.4" rev="1" basever="1.18.0"
          date="2020-09-29" time="19:37:03 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-perl.xml b/docs/nginx-module-perl.xml
index 8bb5742..9d1a05e 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.18.0" rev="2"
+         date="2020-10-29" time="12:59:47 +0300"
+         packager="Andrei Belov &lt;defan@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.18.0-2
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-perl" ver="1.18.0" rev="1"
          date="2020-04-21" time="15:43:12 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx-module-xslt.xml b/docs/nginx-module-xslt.xml
index e66d426..48f9f55 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.18.0" rev="2"
+         date="2020-10-29" time="12:59:47 +0300"
+         packager="Andrei Belov &lt;defan@nginx.com&gt;">
+<change>
+<para>
+base version updated to 1.18.0-2
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx-module-xslt" ver="1.18.0" rev="1"
          date="2020-04-21" time="15:43:12 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/docs/nginx.xml b/docs/nginx.xml
index 717a8e8..862b214 100644
--- a/docs/nginx.xml
+++ b/docs/nginx.xml
@@ -5,6 +5,18 @@
 <change_log title="nginx">
 
 
+<changes apply="nginx" ver="1.18.0" rev="2"
+         date="2020-10-29" time="12:59:47 +0300"
+         packager="Andrei Belov &lt;defan@nginx.com&gt;">
+<change>
+<para>
+1.18.0-2 (improved module dependency tracking)
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="nginx" ver="1.18.0" rev="1"
          date="2020-04-21" time="15:43:12 +0300"
          packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
diff --git a/rpm/SPECS/Makefile b/rpm/SPECS/Makefile
index 55bdef0..1a7a0c0 100644
--- a/rpm/SPECS/Makefile
+++ b/rpm/SPECS/Makefile
@@ -1,7 +1,7 @@
 SHELL=		/bin/bash
 
 BASE_VERSION=	1.18.0
-BASE_RELEASE=	1
+BASE_RELEASE=	2
 PLUS_VERSION=	21
 BASE_SRC=	nginx-$(BASE_VERSION).tar.gz
 SRCPATH?=	../SOURCES
diff --git a/rpm/SPECS/Makefile.module-geoip b/rpm/SPECS/Makefile.module-geoip
index 4ff160d..131adfe 100644
--- a/rpm/SPECS/Makefile.module-geoip
+++ b/rpm/SPECS/Makefile.module-geoip
@@ -3,7 +3,7 @@
 MODULE_SUMMARY_geoip=	GeoIP dynamic modules
 
 MODULE_VERSION_geoip=	$(TARGET_VERSION)
-MODULE_RELEASE_geoip=	1
+MODULE_RELEASE_geoip=	2
 
 MODULE_CONFARGS_geoip=	--with-http_geoip_module=dynamic \
 			--with-stream_geoip_module=dynamic
diff --git a/rpm/SPECS/Makefile.module-image-filter b/rpm/SPECS/Makefile.module-image-filter
index 6f92860..3a08162 100644
--- a/rpm/SPECS/Makefile.module-image-filter
+++ b/rpm/SPECS/Makefile.module-image-filter
@@ -3,7 +3,7 @@
 MODULE_SUMMARY_image_filter=	image filter dynamic module
 
 MODULE_VERSION_image_filter=	$(TARGET_VERSION)
-MODULE_RELEASE_image_filter=	1
+MODULE_RELEASE_image_filter=	2
 
 MODULE_CONFARGS_image_filter=	--with-http_image_filter_module=dynamic
 
diff --git a/rpm/SPECS/Makefile.module-njs b/rpm/SPECS/Makefile.module-njs
index d80c047..b35a15c 100644
--- a/rpm/SPECS/Makefile.module-njs
+++ b/rpm/SPECS/Makefile.module-njs
@@ -3,7 +3,7 @@
 MODULE_SUMMARY_njs=	njs dynamic modules
 
 MODULE_VERSION_njs=	0.4.4
-MODULE_RELEASE_njs=	1
+MODULE_RELEASE_njs=	2
 
 MODULE_VERSION_PREFIX_njs=$(MODULE_TARGET_PREFIX)
 
diff --git a/rpm/SPECS/Makefile.module-perl b/rpm/SPECS/Makefile.module-perl
index 67205fa..8aa07d3 100644
--- a/rpm/SPECS/Makefile.module-perl
+++ b/rpm/SPECS/Makefile.module-perl
@@ -3,7 +3,7 @@
 MODULE_SUMMARY_perl=	Perl dynamic module
 
 MODULE_VERSION_perl=	$(TARGET_VERSION)
-MODULE_RELEASE_perl=	1
+MODULE_RELEASE_perl=	2
 
 MODULE_CONFARGS_perl=	--with-http_perl_module=dynamic
 
diff --git a/rpm/SPECS/Makefile.module-xslt b/rpm/SPECS/Makefile.module-xslt
index 4403110..187da5b 100644
--- a/rpm/SPECS/Makefile.module-xslt
+++ b/rpm/SPECS/Makefile.module-xslt
@@ -3,7 +3,7 @@
 MODULE_SUMMARY_xslt=	xslt dynamic module
 
 MODULE_VERSION_xslt=	$(TARGET_VERSION)
-MODULE_RELEASE_xslt=	1
+MODULE_RELEASE_xslt=	2
 
 MODULE_CONFARGS_xslt=	--with-http_xslt_module=dynamic