diff --git a/README.md b/README.md
index 5b126d524..05611e9a6 100644
--- a/README.md
+++ b/README.md
@@ -78,19 +78,19 @@ cd $INSTALL_DIR/emqtt
     {auth, {anonymous, []}}, %internal, anonymous
     {listen, [
         {mqtt, 1883, [
-            {max_clients, 1024},
-            {acceptor_pool, 4}
+            {acceptors, 4},
+            {max_clients, 1024}
         ]},
         {mqtts, 8883, [
+            {acceptors, 4},
             {max_clients, 1024},
-            {acceptor_pool, 4},
             %{cacertfile, "etc/ssl/cacert.pem"}, 
             {ssl, [{certfile, "etc/ssl.crt"},
                    {keyfile,  "etc/ssl.key"}]}
         ]},
         {http, 8083, [
-            {max_clients, 512},
-            {acceptor_pool, 1}
+            {acceptors, 1},
+            {max_clients, 512}
         ]}
     ]}
  ]}
diff --git a/apps/emqttd/src/emqttd_ctl.erl b/apps/emqttd/src/emqttd_ctl.erl
index f09b39cba..4fa2433a2 100644
--- a/apps/emqttd/src/emqttd_ctl.erl
+++ b/apps/emqttd/src/emqttd_ctl.erl
@@ -95,7 +95,7 @@ broker(["metrics"]) ->
 listeners([]) ->
     lists:foreach(fun({{Protocol, Port}, Pid}) ->
                 ?PRINT("listener ~s:~p~n", [Protocol, Port]), 
-                ?PRINT("  acceptor_pool: ~p~n", [esockd:get_acceptor_pool(Pid)]),
+                ?PRINT("  acceptors: ~p~n", [esockd:get_acceptors(Pid)]),
                 ?PRINT("  max_clients: ~p~n", [esockd:get_max_clients(Pid)]),
                 ?PRINT("  current_clients: ~p~n", [esockd:get_current_clients(Pid)])
         end, esockd:listeners()).
diff --git a/apps/emqttd/test/emqttd_opts_tests.erl b/apps/emqttd/test/emqttd_opts_tests.erl
index cf6c331a5..d7cfce02e 100644
--- a/apps/emqttd/test/emqttd_opts_tests.erl
+++ b/apps/emqttd/test/emqttd_opts_tests.erl
@@ -43,11 +43,11 @@ merge_test() ->
                                         {backlog, 1024},
                                         {nodelay, false},
                                         {max_clients, 1024},
-                                        {acceptor_pool, 4}]),
+                                        {acceptors, 16}]),
     ?assertEqual(1024, proplists:get_value(backlog, Opts)),
     ?assertEqual(1024, proplists:get_value(max_clients, Opts)),
     ?assertEqual(lists:sort(Opts), [binary, raw,
-                                    {acceptor_pool,4},
+                                    {acceptors,4},
                                     {backlog,1024},
                                     {max_clients,1024},
                                     {nodelay,false},
diff --git a/doc/GetStarted.md b/doc/GetStarted.md
index 53daf0ad3..0514a5f49 100644
--- a/doc/GetStarted.md
+++ b/doc/GetStarted.md
@@ -99,12 +99,12 @@ cd emqtt && ./bin/emqtt stop
     ]},
     {listen, [
         {mqtt, 1883, [
-            {max_conns, 1024},
-            {acceptor_pool, 4}
+            {acceptors, 4},
+            {max_conns, 1024}
         ]},
         {http, 8083, [
-            {max_conns, 512},
-            {acceptor_pool, 1}
+            {acceptors, 1},
+            {max_conns, 512}
         ]}
     ]}
 ]}
diff --git a/rel/files/app.config b/rel/files/app.config
index 47b9097a5..5fb59d589 100644
--- a/rel/files/app.config
+++ b/rel/files/app.config
@@ -65,21 +65,21 @@
     ]},
     {listen, [
         {mqtt, 1883, [
-            {backlog,   512},
+            {backlog, 512},
             {max_clients, 1024},
-            {acceptor_pool, 4}
+            {acceptors, 16}
         ]},
         {mqtts, 8883, [
-            {backlog,   128},
+            {backlog, 128},
+            {acceptors, 4},
             {max_clients, 1024},
-            {acceptor_pool, 4},
             %{cacertfile, "etc/ssl/cacert.pem"}, 
             {ssl, [{certfile, "etc/ssl.crt"},
                    {keyfile,  "etc/ssl.key"}]}
         ]},
         {http, 8083, [
+            {acceptors, 4}
             {max_clients, 512},
-            {acceptor_pool, 1}
         ]}
     ]}
  ]}