diff --git a/debian/changelog b/debian/changelog
index 3ee762c..9225257 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nginx (1.9.11-1) unstable; urgency=low
+
+  * 1.9.11
+  * dynamic modules path and symlink in /etc/nginx added
+
+ -- Sergey Budnevitch <sb@nginx.com>  Tue, 09 Feb 2016 17:37:00 +0300
+
 nginx (1.9.10-1) unstable; urgency=low
 
   * 1.9.10
diff --git a/debian/rules b/debian/rules
index 7f030fc..9c54cb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,8 @@
 #export DH_VERBOSE=1
 CFLAGS ?= $(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS ?= $(shell dpkg-buildflags --get LDFLAGS)
-WITH_HTTP2 := $(shell printf "Source: nginx\nBuild-Depends: libssl-dev (>= 1.0.1)\n" | \
+WITH_HTTP2 := $(shell printf \
+	"Source: nginx\nBuild-Depends: libssl-dev (>= 1.0.1)\n" | \
 	dpkg-checkbuilddeps - >/dev/null 2>&1 && \
 	echo "--with-http_v2_module")
 
@@ -21,6 +22,7 @@
 	CFLAGS="" ./configure \
 		--prefix=/etc/nginx \
 		--sbin-path=/usr/sbin/nginx \
+		--modules-path=%{_libdir}/nginx/modules \
 		--conf-path=/etc/nginx/nginx.conf \
 		--error-log-path=/var/log/nginx/error.log \
 		--http-log-path=/var/log/nginx/access.log \
@@ -63,6 +65,7 @@
 	CFLAGS="" ./configure \
 		--prefix=/etc/nginx \
 		--sbin-path=/usr/sbin/nginx \
+		--modules-path=%{_libdir}/nginx/modules \
 		--conf-path=/etc/nginx/nginx.conf \
 		--error-log-path=/var/log/nginx/error.log \
 		--http-log-path=/var/log/nginx/access.log \
@@ -107,13 +110,16 @@
 		-e 's/%%DEFAULTSTOP%%/0 1 6/g' \
 		< debian/init.d.in > debian/init.d
 	dh_auto_install
-	mkdir -p debian/nginx/etc/init.d debian/nginx/etc/default
+	mkdir -p debian/nginx/etc/init.d debian/nginx/etc/default \
+		debian/nginx/usr/lib/nginx/modules
 	sed -e 's/%%PROVIDES%%/nginx-debug/g' \
 		-e 's/%%DEFAULTSTART%%//g' \
 		-e 's/%%DEFAULTSTOP%%/0 1 2 3 4 5 6/g' \
 		< debian/init.d.in > debian/debug.init.d
-	/usr/bin/install -m 755 debian/debug.init.d debian/nginx/etc/init.d/nginx-debug
-	/usr/bin/install -m 644 debian/nginx-debug.default debian/nginx/etc/default/nginx-debug
+	/usr/bin/install -m 755 debian/debug.init.d \
+		debian/nginx/etc/init.d/nginx-debug
+	/usr/bin/install -m 644 debian/nginx-debug.default \
+		debian/nginx/etc/default/nginx-debug
 	/usr/bin/install -m 644 debian/nginx.conf debian/nginx/etc/nginx/
 	/usr/bin/install -m 644 conf/win-utf debian/nginx/etc/nginx/
 	/usr/bin/install -m 644 conf/koi-utf debian/nginx/etc/nginx/
@@ -122,11 +128,16 @@
 	/usr/bin/install -m 644 conf/scgi_params debian/nginx/etc/nginx/
 	/usr/bin/install -m 644 conf/fastcgi_params debian/nginx/etc/nginx/
 	/usr/bin/install -m 644 conf/uwsgi_params debian/nginx/etc/nginx/
-	/usr/bin/install -m 644 html/index.html debian/nginx/usr/share/nginx/html/
-	/usr/bin/install -m 644 html/50x.html debian/nginx/usr/share/nginx/html/
-	/usr/bin/install -m 644 debian/nginx.vh.default.conf debian/nginx/etc/nginx/conf.d/default.conf
+	/usr/bin/install -m 644 html/index.html \
+		debian/nginx/usr/share/nginx/html/
+	/usr/bin/install -m 644 html/50x.html \
+		debian/nginx/usr/share/nginx/html/
+	/usr/bin/install -m 644 debian/nginx.vh.default.conf \
+		debian/nginx/etc/nginx/conf.d/default.conf
 	/usr/bin/install -m 755 objs/nginx  debian/nginx/usr/sbin/
 	/usr/bin/install -m 755 objs/nginx-debug  debian/nginx/usr/sbin/
+	cd debian/nginx/etc/nginx && /bin/ln -s \
+		../../usr/lib/nginx/modules modules && cd -
 
 override_dh_clean:
 	dh_clean
diff --git a/rpm/SPECS/nginx.spec b/rpm/SPECS/nginx.spec
index 7930be9..06bea6e 100644
--- a/rpm/SPECS/nginx.spec
+++ b/rpm/SPECS/nginx.spec
@@ -51,7 +51,7 @@
 
 Summary: High performance web server
 Name: nginx
-Version: 1.9.10
+Version: 1.9.11
 Release: 1%{?dist}.ngx
 Vendor: nginx inc.
 URL: http://nginx.org/
@@ -97,6 +97,7 @@
 ./configure \
         --prefix=%{_sysconfdir}/nginx \
         --sbin-path=%{_sbindir}/nginx \
+        --modules-path=%{_libdir}/nginx/modules \
         --conf-path=%{_sysconfdir}/nginx/nginx.conf \
         --error-log-path=%{_localstatedir}/log/nginx/error.log \
         --http-log-path=%{_localstatedir}/log/nginx/access.log \
@@ -130,9 +131,9 @@
         --with-mail_ssl_module \
         --with-file-aio \
         --with-ipv6 \
-        --with-debug \
         %{?with_http2:--with-http_v2_module} \
         --with-cc-opt="%{optflags} $(pcre-config --cflags)" \
+        --with-debug \
         $*
 make %{?_smp_mflags}
 %{__mv} %{_builddir}/%{name}-%{version}/objs/nginx \
@@ -140,6 +141,7 @@
 ./configure \
         --prefix=%{_sysconfdir}/nginx \
         --sbin-path=%{_sbindir}/nginx \
+        --modules-path=%{_libdir}/nginx/modules \
         --conf-path=%{_sysconfdir}/nginx/nginx.conf \
         --error-log-path=%{_localstatedir}/log/nginx/error.log \
         --http-log-path=%{_localstatedir}/log/nginx/access.log \
@@ -192,6 +194,10 @@
 %{__mkdir} -p $RPM_BUILD_ROOT%{_localstatedir}/run/nginx
 %{__mkdir} -p $RPM_BUILD_ROOT%{_localstatedir}/cache/nginx
 
+%{__mkdir} -p $RPM_BUILD_ROOT%{_libdir}/nginx/modules
+cd $RPM_BUILD_ROOT%{_sysconfdir}/nginx/modules && \
+    %{__ln_s} ../..%{_libdir}/nginx/modules modules && cd -
+
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
 %{__install} -m 644 -p %{SOURCE12} \
     $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}/
@@ -250,6 +256,7 @@
 
 %dir %{_sysconfdir}/nginx
 %dir %{_sysconfdir}/nginx/conf.d
+%{_sysconfdir}/nginx/modules
 
 %config(noreplace) %{_sysconfdir}/nginx/nginx.conf
 %config(noreplace) %{_sysconfdir}/nginx/conf.d/default.conf
@@ -274,6 +281,8 @@
 %{_initrddir}/nginx-debug
 %endif
 
+%attr(0755,root,root) %dir %{_libdir}/nginx
+%attr(0755,root,root) %dir %{_libdir}/nginx/modules
 %dir %{_datadir}/nginx
 %dir %{_datadir}/nginx/html
 %{_datadir}/nginx/html/*
@@ -357,6 +366,10 @@
 fi
 
 %changelog
+* Tue Feb  9 2016 Sergey Budnevitch <sb@nginx.com>
+* dynamic modules path and symlink in %{_sysconfdir}/nginx added
+- 1.9.11
+
 * Tue Jan 26 2016 Konstantin Pavlov <thresh@nginx.com>
 - 1.9.10