diff --git a/linux/storage/mount.sls b/linux/storage/mount.sls
index 09a3c9b..0950061 100644
--- a/linux/storage/mount.sls
+++ b/linux/storage/mount.sls
@@ -1,6 +1,21 @@
 {%- from "linux/map.jinja" import storage with context %}
 {%- if storage.enabled %}
 
+{%- set install_xfs = False %}
+
+{%- for name, mount in storage.mount.iteritems() %}
+  {%- if mount.enabled and mount.file_system == 'xfs' %}
+    {%- set install_xfs = True %}
+  {%- endif %}
+{%- endfor %}
+
+{%- if install_xfs == True %}
+xfs_packages:
+  package.installed:
+    - name: xfsprogs
+{%- endif %}
+
+
 {%- for name, mount in storage.mount.iteritems() %}
 
 {%- if mount.enabled %}
@@ -22,6 +37,10 @@
   - fstype: {{ mount.file_system }}
   - mkmnt: True
   - opts: {{ mount.get('opts', 'defaults,noatime') }}
+  {%- if mount.file_system == 'xfs' %}
+  require:
+    - pkg: xfs_packages
+  {%- endif %}
 
 {%- endif %}
 
diff --git a/tests/pillar/storage.sls b/tests/pillar/storage.sls
index 6c15b11..30c3214 100644
--- a/tests/pillar/storage.sls
+++ b/tests/pillar/storage.sls
@@ -17,3 +17,9 @@
             size: 512M
             mount:
               path: /srv
+    disk1:
+      enabled: true
+      device: /dev/dummy
+      path: /srv/dummy
+      file_system: xfs
+      options: "noatime,nobarrier,logbufs=8"