diff --git a/collectd/definitions/collectd_plugin.rb b/collectd/definitions/collectd_plugin.rb
index dd826e9..aec51ba 100644
--- a/collectd/definitions/collectd_plugin.rb
+++ b/collectd/definitions/collectd_plugin.rb
@@ -22,7 +22,7 @@
     owner "root"
     group "root"
     mode "644"
-    if params[:template].blank?
+    if params[:template].nil? || params[:template].empty?
       source "plugin.conf.erb"
       cookbook params[:cookbook] || "collectd"
     else
diff --git a/collectd/metadata.rb b/collectd/metadata.rb
index 1bcf098..ca156e4 100644
--- a/collectd/metadata.rb
+++ b/collectd/metadata.rb
@@ -3,5 +3,8 @@
 license          "Apache 2.0"
 description      "Install and configure the collectd monitoring daemon"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version          "1.0.0"
-supports         "ubuntu"
+version          "1.0.1"
+
+%w{debian ubuntu}.each do |os|
+  supports os
+end
diff --git a/collectd/recipes/client.rb b/collectd/recipes/client.rb
index 5c1be7d..322d62d 100644
--- a/collectd/recipes/client.rb
+++ b/collectd/recipes/client.rb
@@ -20,7 +20,7 @@
 include_recipe "collectd"
 
 servers = []
-search(:node, 'recipes:"collectd::server"') do |n|
+search(:node, 'recipes:"collectd\:\:server"') do |n|
   servers << n['fqdn']
 end
 
diff --git a/collectd/recipes/collectd_web.rb b/collectd/recipes/collectd_web.rb
index a948d5b..d297f60 100644
--- a/collectd/recipes/collectd_web.rb
+++ b/collectd/recipes/collectd_web.rb
@@ -20,6 +20,12 @@
 include_recipe "collectd"
 include_recipe "apache2"
 
+%w{libjson-perl libhtml-entities-numbered-perl libhtml-parser-perl librrds-perl}.each do |pkg|
+  package pkg do
+    action :install
+  end
+end
+
 directory node[:collectd][:collectd_web][:path] do
   owner "root"
   group "root"
diff --git a/collectd/recipes/default.rb b/collectd/recipes/default.rb
index cf5277e..c6ef2c2 100644
--- a/collectd/recipes/default.rb
+++ b/collectd/recipes/default.rb
@@ -18,7 +18,12 @@
 #
 
 package "collectd" do
-  package_name "collectd-core"
+  case node[:platform]
+  when "ubuntu"
+    package_name "collectd-core"
+  when "debian"
+    package_name "collectd"
+  end
 end
 
 service "collectd" do