diff --git a/etc/emq.conf b/etc/emq.conf
index e4434283a..eda64ec2b 100644
--- a/etc/emq.conf
+++ b/etc/emq.conf
@@ -11,6 +11,10 @@ node.cookie = emq_dist_cookie
 ## SMP support: enable, auto, disable
 node.smp = auto
 
+## TODO: -heart Heartbeat monitoring of an Erlang runtime system
+## Values: on | off
+## node.heartbeat = off
+
 ## Enable kernel poll
 node.kernel_poll = on
 
@@ -219,12 +223,12 @@ mqtt.listener.http.acceptors = 4
 mqtt.listener.http.max_clients = 64
 
 ## HTTP(SSL) Listener
-## mqtt.listener.https = 8084
-## mqtt.listener.https.acceptors = 4
-## mqtt.listener.https.max_clients = 64
-## mqtt.listener.https.handshake_timeout = 15
-## mqtt.listener.https.certfile = etc/certs/cert.pem
-## mqtt.listener.https.keyfile = etc/certs/key.pem
+mqtt.listener.https = 8084
+mqtt.listener.https.acceptors = 4
+mqtt.listener.https.max_clients = 64
+mqtt.listener.https.handshake_timeout = 15
+mqtt.listener.https.certfile = etc/certs/cert.pem
+mqtt.listener.https.keyfile = etc/certs/key.pem
 ## mqtt.listener.https.cacertfile = etc/certs/cacert.pem
 ## mqtt.listener.https.verify = verify_peer
 ## mqtt.listener.https.fail_if_no_peer_cert = true