diff --git a/ejabberd/templates/ejabberd.yml.erb b/ejabberd/templates/ejabberd.yml.erb
index cdecc70..cc3a667 100644
--- a/ejabberd/templates/ejabberd.yml.erb
+++ b/ejabberd/templates/ejabberd.yml.erb
@@ -8,6 +8,9 @@ hosts:
 
 listen:
   -
+<% if @ipaddress6 -%>
+    ip: "::"
+<% end -%>
     port: 5222
     module: ejabberd_c2s
     max_stanza_size: 655360
@@ -16,6 +19,9 @@ listen:
     starttls_required: true
     certfile: "/etc/ejabberd/ejabberd.pem"
   -
+<% if @ipaddress6 -%>
+    ip: "::"
+<% end -%>
     port: 5223
     module: ejabberd_c2s
     max_stanza_size: 655360
@@ -24,16 +30,29 @@ listen:
     tls: true
     certfile: "/etc/ejabberd/ejabberd.pem"
   -
+<% if @ipaddress6 -%>
+    ip: "::"
+<% end -%>
     port: 5269
     module: ejabberd_s2s_in
     max_stanza_size: 1310720
     shaper: s2s_shaper
   -
+    ip: "127.0.0.1"
     port: 5280
     module: ejabberd_http
     web_admin: true
     http_poll: true
     http_bind: true
+<% if @ipaddress6 -%>
+  -
+    ip: "::1"
+    port: 5280
+    module: ejabberd_http
+    web_admin: true
+    http_poll: true
+    http_bind: true
+<% end -%>
 
 s2s_access: s2s
 s2s_certfile: "/etc/ejabberd/ejabberd.pem"