diff --git a/modules/meetbot/templates/supybot.conf.erb b/modules/meetbot/templates/supybot.conf.erb
index 4c22d5a41e..3f32674603 100644
--- a/modules/meetbot/templates/supybot.conf.erb
+++ b/modules/meetbot/templates/supybot.conf.erb
@@ -63,7 +63,7 @@ supybot.networks.<%= network %>.servers: <%= server %>
 #
 # Default value:
 ###
-supybot.networks.<%= network %>.channels: <%= channels %>
+supybot.networks.<%= network %>.channels: <% channels.each do |channel| %> <%= channel %> <% end %>
 
 ###
 # Determines what key (if any) will be used to join the channel.
diff --git a/modules/openstack_project/manifests/eavesdrop.pp b/modules/openstack_project/manifests/eavesdrop.pp
index a1712c56c8..922c6aedfe 100644
--- a/modules/openstack_project/manifests/eavesdrop.pp
+++ b/modules/openstack_project/manifests/eavesdrop.pp
@@ -22,7 +22,13 @@ class openstack_project::eavesdrop (
     nickpass  => $nickpass,
     network   => 'FreeNode',
     server    => 'chat.freenode.net:7000',
-    channels  => '#openstack #openstack-dev #openstack-meeting #openstack-meeting-alt',
+    channels  => [
+        '#openstack',
+        '#openstack-dev',
+        '#openstack-infra',
+        '#openstack-meeting',
+        '#openstack-meeting-alt',
+    ],
     use_ssl   => 'True'
   }