diff --git a/manifests/init.pp b/manifests/init.pp
index a562ba3..864247e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,7 +4,7 @@ class statusbot(
   $nick = '',
   $password = '',
   $server = '',
-  $channels = '',
+  $channels = [],
   $auth_nicks = '',
   $wiki_user = '',
   $wiki_password = '',
diff --git a/templates/statusbot.config.erb b/templates/statusbot.config.erb
index 87743ee..2d5be92 100644
--- a/templates/statusbot.config.erb
+++ b/templates/statusbot.config.erb
@@ -3,7 +3,11 @@ nick=<%= nick %>
 pass=<%= password %>
 server=<%= server %>
 port=6667
-channels=<%= channels %>
+<% if @channels.respond_to?('join') -%>
+channels=<%= @channels.join(',') %>
+<% else -%>
+channels=<%= @channels %>
+<% end -%>
 nicks=<%= auth_nicks %>
 lockfile=/var/run/statusbot/statusbot.pid
 log_config=/etc/statusbot/logging.config