diff --git a/salt/files/_api.conf b/salt/files/_api.conf
index 26856f8..1a8364d 100644
--- a/salt/files/_api.conf
+++ b/salt/files/_api.conf
@@ -22,6 +22,9 @@
   disable_ssl: True
   {%- endif %}
   expire_responses: {{ api.get('expire_responses', False) }}
+  {%- if api.rest_timeout is defined %}
+  rest-timeout: {{ api.rest_timeout }}
+  {%- endif %}
   {%- if api.get('debug', False) %}
   debug: True
   {%- endif %}
diff --git a/tests/pillar/master_api.sls b/tests/pillar/master_api.sls
index 6be5097..4687480 100644
--- a/tests/pillar/master_api.sls
+++ b/tests/pillar/master_api.sls
@@ -20,6 +20,7 @@
         formula: {}
   api:
     enabled: true
+    rest_timeout: 7200
     ssl:
       engine: salt
     bind: