diff --git a/linux/storage/mount.sls b/linux/storage/mount.sls
index 0950061..aa729fb 100644
--- a/linux/storage/mount.sls
+++ b/linux/storage/mount.sls
@@ -28,6 +28,10 @@
   - onlyif: "test `blkid {{ mount.device }} >/dev/null;echo $?` -eq 2"
   - require_in:
     - mount: {{ mount.path }}
+  {%- if mount.file_system == 'xfs' %}
+  - require:
+    - pkg: xfs_packages
+  {%- endif %}
 
 {%- endif %}
 
@@ -38,10 +42,21 @@
   - mkmnt: True
   - opts: {{ mount.get('opts', 'defaults,noatime') }}
   {%- if mount.file_system == 'xfs' %}
-  require:
+  - require:
     - pkg: xfs_packages
   {%- endif %}
 
+{%- if mount.user is defined %}
+{{ mount.path }}_permissions:
+  file.directory:
+    - name: {{ mount.path }}
+    - user: {{ mount.user }}
+    - group: {{ mount.get('group', 'root') }}
+    - mode: {{ mount.get('mode', 755) }}
+    - require:
+      - mount: {{ mount.path }}
+{%- endif %}
+
 {%- endif %}
 
 {%- endfor %}
diff --git a/tests/pillar/storage.sls b/tests/pillar/storage.sls
index 30c3214..7c9a363 100644
--- a/tests/pillar/storage.sls
+++ b/tests/pillar/storage.sls
@@ -23,3 +23,6 @@
       path: /srv/dummy
       file_system: xfs
       options: "noatime,nobarrier,logbufs=8"
+      user: nobody
+      group: nogroup
+      mode: 755