diff --git a/network/nginx/config.in b/network/nginx/config.in
index 46ffde480..495e8a4c0 100644
--- a/network/nginx/config.in
+++ b/network/nginx/config.in
@@ -23,6 +23,9 @@ if pkgcheck nginx X; then
 	# upload module
 	bool "Upload Module"	SDECFG_PKG_NGINX_ADDON_MOD_UPLOAD 0
 
+	# http echo module
+	bool "HTTP Echo Module"	SDECFG_PKG_NGINX_ADDON_MOD_HTTPECHO 0
+
 	menu_end
 fi
 
diff --git a/network/nginx/nginx.conf b/network/nginx/nginx.conf
index c8a9a49e0..3c641c905 100644
--- a/network/nginx/nginx.conf
+++ b/network/nginx/nginx.conf
@@ -105,3 +105,7 @@ fi
 if [ "$SDECFG_PKG_NGINX_ADDON_MOD_UPLOAD" == 1 ] ; then
 	hook_add preconf 5 "pkg_nginx_add_module nginx_upload_module" 
 fi
+
+if [ "$SDECFG_PKG_NGINX_ADDON_MOD_HTTPECHO" == 1 ] ; then
+	hook_add preconf 5 "pkg_nginx_add_module echo-nginx-module"
+fi
diff --git a/network/nginx/nginx.desc b/network/nginx/nginx.desc
index 2879d72eb..9995daf98 100644
--- a/network/nginx/nginx.desc
+++ b/network/nginx/nginx.desc
@@ -51,3 +51,4 @@
 [D] 1775959278 nginx-1.0.4.tar.gz http://nginx.org/download/
 [D] 2799334071 nginx-mod_rrd_graph-0.2.0.tar.gz !http://wiki.nginx.org/images/9/9d/Mod_rrd_graph-0.2.0.tar.gz
 [D] 417317636 nginx_upload_module-2.2.0.tar.gz http://www.grid.net.ru/nginx/download/
+[D] 3043925941 echo-nginx-module-v0.36rc2.tar.gz !https://github.com/agentzh/echo-nginx-module/tarball/v0.36rc2