diff --git a/etc/emq.conf b/etc/emq.conf
index 2a23bd1ee..d7de1e9fd 100644
--- a/etc/emq.conf
+++ b/etc/emq.conf
@@ -80,6 +80,9 @@ mqtt.client_idle_timeout = 30
 ## Allow Anonymous authentication
 mqtt.allow_anonymous = true
 
+## Default ACL File
+mqtt.acl_file = etc/acl.conf
+
 ##--------------------------------------------------------------------
 ## MQTT Session
 ##--------------------------------------------------------------------
@@ -235,7 +238,7 @@ mqtt.listener.ssl.max_clients = 512
 
 ## Configuring SSL Options
 ## See http://erlang.org/doc/man/ssl.html
-mqtt.listener.ssl.handshake_timeout = 15 #seconds
+mqtt.listener.ssl.handshake_timeout = 15
 mqtt.listener.ssl.keyfile = etc/ssl/key.pem
 mqtt.listener.ssl.certfile = etc/ssl/cert.pem
 mqtt.listener.ssl.cacertfile = etc/ssl/cacert.pem
@@ -251,7 +254,7 @@ mqtt.listener.http.max_clients = 64
 mqtt.listener.https = 8084
 mqtt.listener.https.acceptors = 4
 mqtt.listener.https.max_clients = 64
-mqtt.listener.https.handshake_timeout = 10 #seconds
+mqtt.listener.https.handshake_timeout = 10
 mqtt.listener.https.certfile = etc/ssl/cert.pem
 mqtt.listener.https.keyfile = etc/ssl/key.pem
 mqtt.listener.https.cacertfile = etc/ssl/cacert.pem