diff --git a/munin/map.jinja b/munin/map.jinja
index 8602886..f2eb776 100644
--- a/munin/map.jinja
+++ b/munin/map.jinja
@@ -51,7 +51,8 @@
         'service': 'munin-node',
         'config': '/etc/munin/munin-node.conf',
         'config_src': 'salt://munin/files/munin-node.conf',
-        'plugin_dir': '/usr/share/munin/plugins',
+        'plugin_dir': '/etc/munin/plugins',
+        'plugin_target_dir': '/usr/share/munin/plugins',
         'file_user': 'root',
         'file_group': 'root',
     },
@@ -60,7 +61,8 @@
         'service': 'munin-node',
         'config': '/etc/munin/munin-node.conf',
         'config_src': 'salt://munin/files/munin-node.conf',
-        'plugin_dir': '/usr/share/munin/plugins',
+        'plugin_dir': '/etc/munin/plugins',
+        'plugin_target_dir': '/usr/share/munin/plugins',
         'file_user': 'root',
         'file_group': 'root',
     },
@@ -69,7 +71,8 @@
         'service': 'munin-node',
         'config': '/etc/munin/munin-node.conf',
         'config_src': 'salt://munin/files/munin-node.conf',
-        'plugin_dir': '/usr/share/munin/plugins',
+        'plugin_dir': '/etc/munin/plugins',
+        'plugin_target_dir': '/usr/share/munin/plugins',
         'file_user': 'root',
         'file_group': 'root',
     },
@@ -78,7 +81,8 @@
         'service': 'munin-node',
         'config': '/etc/munin/munin-node.conf',
         'config_src': 'salt://munin/files/munin-node.conf',
-        'plugin_dir': '/usr/lib/munin/plugins',
+        'plugin_dir': '/etc/munin/plugins',
+        'plugin_target_dir': '/usr/lib/munin/plugins',
         'file_user': 'root',
         'file_group': 'root',
     },
@@ -87,7 +91,8 @@
         'service': 'munin-node',
         'config': '/etc/munin/munin-node.conf',
         'config_src': 'salt://munin/files/munin-node.conf',
-        'plugin_dir': '/usr/libexec/munin/plugins',
+        'plugin_dir': '/etc/munin/plugins',
+        'plugin_target_dir': '/usr/libexec/munin/plugins',
         'file_user': 'root',
         'file_group': 'root',
     },
@@ -97,6 +102,7 @@
         'config': '/usr/local/etc/munin/munin-node.conf',
         'config_src': 'salt://munin/files/munin-node.conf',
         'plugin_dir': '/usr/local/etc/munin/plugins',
+        'plugin_target_dir': '/usr/local/share/munin/plugins',
         'file_user': 'root',
         'file_group': 'wheel',
     },
@@ -139,4 +145,3 @@
         'ca_certificate': '/usr/local/etc/munin/tls/cacert.pem',
     },
 }, merge=salt['pillar.get']('munin:lookup:tls')) %}
-
diff --git a/munin/node/plugins.sls b/munin/node/plugins.sls
index 1870074..90cfbaf 100644
--- a/munin/node/plugins.sls
+++ b/munin/node/plugins.sls
@@ -7,7 +7,7 @@ include:
 {% for plugin, linked_file in pillar.get('munin_node_common_plugins', {}).items() %}
 {{ munin_node.plugin_dir }}/{{ plugin }}:
   file.symlink:
-    - target: {{ munin_node.plugin_dir}}/{{ linked_file }}
+    - target: {{ munin_node.plugin_target_dir}}/{{ linked_file }}
     - user: {{ munin_node.file_user }}
     - group: {{ munin_node.file_group }}
     - mode: 755
@@ -19,7 +19,7 @@ include:
 {% for plugin_name, linked_file in plugin.items() %}
 {{ munin_node.plugin_dir }}/{{ plugin_name }}:
   file.symlink:
-    - target: {{ munin_node.plugin_dir}}/{{ linked_file }}
+    - target: {{ munin_node.plugin_target_dir}}/{{ linked_file }}
     - user: {{ munin_node.file_user }}
     - group: {{ munin_node.file_group }}
     - mode: 755