diff --git a/glusterfs/client.sls b/glusterfs/client.sls
index 71e9cb1..0994ceb 100644
--- a/glusterfs/client.sls
+++ b/glusterfs/client.sls
@@ -23,6 +23,7 @@
         path: {{ volume.path }}
         device: {{ volume.server }}:/{{ name }}
         options: {{ volume.get('opts', client.mount_defaults) }}
+        timeout: {{ volume.get('timeout', 300) }}
 
 glusterfs_mount_{{ name }}:
   service.running:
diff --git a/glusterfs/files/glusterfs-client.mount b/glusterfs/files/glusterfs-client.mount
index a0a7cd1..df1cd08 100644
--- a/glusterfs/files/glusterfs-client.mount
+++ b/glusterfs/files/glusterfs-client.mount
@@ -7,6 +7,7 @@
 Where={{ path }}
 Type=glusterfs
 Options={{ options }}
+Timeout={{ timeout|default(300) }}
 
 [Install]
 WantedBy=multi-user.target