diff --git a/Makefile b/Makefile
index 2d3989929..1cddc5fe2 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ dep_gproc        = git https://github.com/uwiger/gproc
 dep_getopt       = git https://github.com/jcomellas/getopt v0.8.2
 dep_lager        = git https://github.com/basho/lager master
 dep_esockd       = git https://github.com/emqtt/esockd v5.2
-dep_ekka         = git https://github.com/emqtt/ekka master
-dep_mochiweb     = git https://github.com/emqtt/mochiweb v4.2.0
+dep_ekka         = git https://github.com/emqtt/ekka v0.2.1
+dep_mochiweb     = git https://github.com/emqtt/mochiweb v4.2.1
 dep_pbkdf2       = git https://github.com/emqtt/pbkdf2 2.0.1
 dep_lager_syslog = git https://github.com/basho/lager_syslog
 dep_bcrypt       = git https://github.com/smarkets/erlang-bcrypt master
diff --git a/etc/emq.conf b/etc/emq.conf
index db62e1d49..68cf8b6b7 100644
--- a/etc/emq.conf
+++ b/etc/emq.conf
@@ -1,6 +1,6 @@
-##===================================================================
+##====================================================================
 ## EMQ Configuration R2.3.0
-##===================================================================
+##====================================================================
 
 ##--------------------------------------------------------------------
 ## Cluster
@@ -327,6 +327,9 @@ listener.tcp.external.acceptors = 16
 ## Maximum number of concurrent clients
 listener.tcp.external.max_clients = 102400
 
+## TODO:
+## listener.tcp.external.zone = external
+
 #listener.tcp.external.mountpoint = external/
 
 ## Rate Limit. Format is 'burst,rate', Unit is KB/Sec
@@ -370,6 +373,8 @@ listener.tcp.internal.acceptors = 16
 ## Maximum number of concurrent clients
 listener.tcp.internal.max_clients = 102400
 
+#listener.tcp.internal.zone = internal
+
 #listener.tcp.external.mountpoint = internal/
 
 ## Rate Limit. Format is 'burst,rate', Unit is KB/Sec
@@ -404,6 +409,9 @@ listener.ssl.external.acceptors = 16
 ## Maximum number of concurrent clients
 listener.ssl.external.max_clients = 1024
 
+## Authentication Zone
+## listener.ssl.external.zone = external
+
 ## listener.ssl.external.mountpoint = inbound/
 
 ## Rate Limit. Format is 'burst,rate', Unit is KB/Sec
@@ -509,6 +517,8 @@ listener.ws.external.acceptors = 4
 
 listener.ws.external.max_clients = 64
 
+## listener.ws.external.zone = external
+
 listener.ws.external.access.1 = allow all
 
 ## Proxy Protocol V1/2
@@ -539,6 +549,8 @@ listener.wss.external.acceptors = 4
 
 listener.wss.external.max_clients = 64
 
+## listener.wss.external.zone = external
+
 listener.wss.external.access.1 = allow all
 
 ## Proxy Protocol V1/2