diff --git a/debian/control b/debian/control
index fb4ae7b..acf710a 100644
--- a/debian/control
+++ b/debian/control
@@ -48,8 +48,8 @@
 Architecture: any
 Priority: extra
 Depends: ${misc:Depends}, ${shlibs:Depends}, nginx (= ${source:Version})
-Description: geoip module
- This package contains dynamic geoip module for nginx.
+Description: geoip modules
+ This package contains dynamic geoip modules for nginx.
 
 Package: nginx-module-perl
 Architecture: any
diff --git a/debian/nginx-module-geoip.install b/debian/nginx-module-geoip.install
index d6069de..9eade47 100644
--- a/debian/nginx-module-geoip.install
+++ b/debian/nginx-module-geoip.install
@@ -1,2 +1,4 @@
 objs/ngx_http_geoip_module.so usr/lib/nginx/modules
 objs/ngx_http_geoip_module-debug.so usr/lib/nginx/modules
+objs/ngx_stream_geoip_module.so usr/lib/nginx/modules
+objs/ngx_stream_geoip_module-debug.so usr/lib/nginx/modules
diff --git a/debian/nginx-module-geoip.preinst b/debian/nginx-module-geoip.preinst
index cdfe806..33498d7 100644
--- a/debian/nginx-module-geoip.preinst
+++ b/debian/nginx-module-geoip.preinst
@@ -5,14 +5,16 @@
         cat <<BANNER
 ----------------------------------------------------------------------
 
-The GeoIP dynamic module for nginx has been installed.
-To enable this module, add the following to /etc/nginx/nginx.conf
+The GeoIP dynamic modules for nginx have been installed.
+To enable those modules, add the following to /etc/nginx/nginx.conf
 and reload nginx:
 
     load_module modules/ngx_http_geoip_module.so;
+    load_module modules/ngx_stream_geoip_module.so;
 
-Please refer to the module documentation for further details:
+Please refer to the modules documentation for further details:
 http://nginx.org/en/docs/http/ngx_http_geoip_module.html
+http://nginx.org/en/docs/stream/ngx_stream_geoip_module.html
 
 ----------------------------------------------------------------------
 BANNER
diff --git a/debian/rules b/debian/rules
index 218301a..16b7fa3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,7 @@
 	--with-threads \
 	--with-stream \
 	--with-stream_ssl_module \
+	--with-stream_geoip_module=dynamic \
 	--with-http_slice_module \
 	--with-mail \
 	--with-mail_ssl_module \
@@ -73,6 +74,7 @@
 	mv objs/ngx_http_perl_module.so objs/ngx_http_perl_module-debug.so
 	mv objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so objs/src/http/modules/perl/blib/arch/auto/nginx/nginx-debug.so
 	mv objs/ngx_http_js_module.so objs/ngx_http_js_module-debug.so
+	mv objs/ngx_stream_geoip_module.so objs/ngx_stream_geoip_module-debug.so
 	CFLAGS="" ./configure $(COMMON_CONFIGURE_ARGS)
 	dh_auto_build
 
diff --git a/rpm/SPECS/nginx.spec b/rpm/SPECS/nginx.spec
index 553ea78..464dec9 100644
--- a/rpm/SPECS/nginx.spec
+++ b/rpm/SPECS/nginx.spec
@@ -115,6 +115,7 @@
         --with-threads \
         --with-stream \
         --with-stream_ssl_module \
+        --with-stream_geoip_module=dynamic \
         --with-http_slice_module \
         --with-mail \
         --with-mail_ssl_module \
@@ -185,9 +186,9 @@
 Release: %{module_geoip_release}
 Group: %{_group}
 Requires: nginx = %{?epoch:%{epoch}:}%{main_version}-%{main_release}
-Summary: nginx geoip module
+Summary: nginx geoip modules
 %description module-geoip
-Dynamic geoip module for nginx.
+Dynamic geoip modules for nginx.
 
 %package module-perl
 Version: %{module_perl_version}
@@ -236,6 +237,8 @@
     %{bdir}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx-debug.so
 %{__mv} %{bdir}/objs/ngx_http_js_module.so \
     %{bdir}/objs/ngx_http_js_module-debug.so
+%{__mv} %{bdir}/objs/ngx_stream_geoip_module.so \
+    %{bdir}/objs/ngx_stream_geoip_module-debug.so
 ./configure %{COMMON_CONFIGURE_ARGS} \
     --with-cc-opt="%{WITH_CC_OPT}"
 make %{?_smp_mflags}
@@ -323,6 +326,8 @@
     $RPM_BUILD_ROOT%{perl_vendorarch}/auto/nginx/nginx-debug.so
 %{__install} -m644 %{bdir}/objs/ngx_http_js_module-debug.so \
     $RPM_BUILD_ROOT%{_libdir}/nginx/modules/ngx_http_js_module-debug.so
+%{__install} -m644 %{bdir}/objs/ngx_stream_geoip_module-debug.so \
+    $RPM_BUILD_ROOT%{_libdir}/nginx/modules/ngx_stream_geoip_module-debug.so
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -383,6 +388,8 @@
 %files module-geoip
 %attr(0644,root,root) %{_libdir}/nginx/modules/ngx_http_geoip_module.so
 %attr(0644,root,root) %{_libdir}/nginx/modules/ngx_http_geoip_module-debug.so
+%attr(0644,root,root) %{_libdir}/nginx/modules/ngx_stream_geoip_module.so
+%attr(0644,root,root) %{_libdir}/nginx/modules/ngx_stream_geoip_module-debug.so
 
 %files module-perl
 %attr(0644,root,root) %{_libdir}/nginx/modules/ngx_http_perl_module.so
@@ -470,14 +477,16 @@
     cat <<BANNER
 ----------------------------------------------------------------------
 
-The GeoIP dynamic module for nginx has been installed.
-To enable this module, add the following to /etc/nginx/nginx.conf
+The GeoIP dynamic modules for nginx have been installed.
+To enable those modules, add the following to /etc/nginx/nginx.conf
 and reload nginx:
 
     load_module modules/ngx_http_geoip_module.so;
+    load_module modules/ngx_stream_geoip_module.so;
 
-Please refer to the module documentation for further details:
+Please refer to the modules documentation for further details:
 http://nginx.org/en/docs/http/ngx_http_geoip_module.html
+http://nginx.org/en/docs/stream/ngx_stream_geoip_module.html
 
 ----------------------------------------------------------------------
 BANNER