diff --git a/roles/munin-server/files/override.conf b/roles/munin-server/files/override.conf
index c8b74d5..fdca67e 100644
--- a/roles/munin-server/files/override.conf
+++ b/roles/munin-server/files/override.conf
@@ -1,4 +1,5 @@
 
+dbdir /srv/munin
 graph_strategy cgi
 cgiurl_graph /munin-cgi/munin-cgi-graph
 cgitmpdir /var/run/munin/cgi-tmp
diff --git a/roles/munin-server/tasks/main.yml b/roles/munin-server/tasks/main.yml
index c6780d7..b727044 100644
--- a/roles/munin-server/tasks/main.yml
+++ b/roles/munin-server/tasks/main.yml
@@ -4,6 +4,29 @@
     name: munin
     state: installed
 
+- name: set file contexts for data directory
+  sefcontext:
+    path: "/export/munin(/.*)?"
+    setype: munin_var_lib_t
+
+- name: create data direcory
+  file:
+    path: /export/munin
+    state: directory
+    mode: 0755
+    owner: munin
+    group: munin
+    setype: _default
+
+- name: link data directory
+  file:
+    dest: /srv/munin
+    src: /export/munin
+    state: link
+    owner: root
+    group: "{{ ansible_wheel }}"
+    follow: false
+
 # for some reason this is owned by adm default
 - name: fix log directory group
   file: