diff --git a/collectd/client.sls b/collectd/client.sls
index ae48006..5e164dc 100644
--- a/collectd/client.sls
+++ b/collectd/client.sls
@@ -77,8 +77,6 @@
     - file: collectd_client_grains_dir
 
 collectd_client_grain_validity_check:
-  pkg.installed:
-  - name: python-yaml 
   cmd.wait:
   - name: python -c "import yaml; stream = file('/etc/salt/grains.d/collectd', 'r'); yaml.load(stream); stream.close()"
   - require:
@@ -170,4 +168,4 @@
   - require:
     - pkg: collectd_client_packages
 
-{%- endif %}
\ No newline at end of file
+{%- endif %}
diff --git a/collectd/map.jinja b/collectd/map.jinja
index a0f5dbd..2dadafd 100644
--- a/collectd/map.jinja
+++ b/collectd/map.jinja
@@ -7,13 +7,13 @@
         'config_dir': '/etc/collectd.d',
     },
     'Debian': {
-        'pkgs': ['collectd-core', 'snmp'],
+        'pkgs': ['collectd-core', 'snmp', 'python-yaml'],
         'service': 'collectd',
         'config_file': '/etc/collectd/collectd.conf',
         'config_dir': '/etc/collectd/conf.d',
     },
     'RedHat': {
-        'pkgs': ['collectd', 'collectd-ping', 'net-snmp'],
+        'pkgs': ['collectd', 'collectd-ping', 'net-snmp', 'PyYAML'],
         'service': 'collectd',
         'config_file': '/etc/collectd.conf',
         'config_dir': '/etc/collectd.d',