diff --git a/munin/manifests/init.pp b/munin/manifests/init.pp
index a0515c1..c85a4d5 100644
--- a/munin/manifests/init.pp
+++ b/munin/manifests/init.pp
@@ -67,10 +67,7 @@ class munin::node {
 
     @@file { "/etc/munin/conf.d/${homename}.conf":
         ensure  => present,
-        content => $::ec2_public_ipv4 ? {
-            ""      => "[${homename}]\n  address ${ipaddress}\n  use_node_name yes\n",
-            default => "[${homename}]\n  address ${ec2_public_ipv4}\n  use_node_name yes\n",
-        },
+        content => "[${homename}]\n  address ${homename}\n  use_node_name yes\n",
         tag     => "munin",
     }
 
diff --git a/munin/templates/munin-node.conf.erb b/munin/templates/munin-node.conf.erb
index f145092..4ad149f 100644
--- a/munin/templates/munin-node.conf.erb
+++ b/munin/templates/munin-node.conf.erb
@@ -42,7 +42,7 @@ allow <%= "^%s$" % allow.gsub('.', '\.') %>
 <% end -%>
 
 # Which address to bind to;
-host <%= @ipaddress %>
+host *
 
 # And which port
 port 4949
diff --git a/munin/templates/munin.conf.erb b/munin/templates/munin.conf.erb
index e98e53e..abde296 100644
--- a/munin/templates/munin.conf.erb
+++ b/munin/templates/munin.conf.erb
@@ -16,6 +16,9 @@ graph_strategy cgi
 cgiurl_graph /munin/cgi/munin-cgi-graph
 <% if @munin_tls == "true" -%>
 
+# Force munin-update to use IPv4 to workaround broken IPv6 support
+local_address <%= @ipaddress %>
+
 # Require TLS
 tls paranoid
 tls_verify_certificate yes