diff --git a/glusterfs/client.sls b/glusterfs/client.sls
index 9d7732b..118b80e 100644
--- a/glusterfs/client.sls
+++ b/glusterfs/client.sls
@@ -15,7 +15,7 @@
     - device: {{ volume.server }}:/{{ name }}
     - fstype: glusterfs
     - mkmnt: true
-    - opts: {{ volume.get('opts', 'defaults,nobootwait') }}
+    - opts: {{ volume.get('opts', client.mount_defaults) }}
     - require:
       - pkg: glusterfs_client_packages
 
diff --git a/glusterfs/map.jinja b/glusterfs/map.jinja
index 6468092..dd56247 100644
--- a/glusterfs/map.jinja
+++ b/glusterfs/map.jinja
@@ -12,8 +12,10 @@
 {% set client = salt['grains.filter_by']({
     'Debian': {
         'pkgs': ['glusterfs-client'],
+        'mount_defaults': 'defaults,nobootwait',
     },
     'RedHat': {
         'pkgs': ['glusterfs-fuse'],
+        'mount_defaults': 'defaults',
     },
 }, merge=salt['pillar.get']('glusterfs:client')) %}