diff --git a/salt/files/master.d/_defaults.conf b/salt/files/master.d/_defaults.conf
index d1b97e1..b08292e 100644
--- a/salt/files/master.d/_defaults.conf
+++ b/salt/files/master.d/_defaults.conf
@@ -484,7 +484,19 @@ fileserver_backend:
 {% if 'gitfs_remotes' in master -%}
 gitfs_remotes:
 {%- for remote in master['gitfs_remotes'] %}
-  - {{ remote }}{% endfor -%}
+{% if remote is mapping %}
+  {%- for repo, children in remote.iteritems() -%}
+    - {{ repo }}:
+  {%- for child in children %}
+    {% for key, value in child.iteritems() -%}
+      - {{ key }}: {{ value }}
+    {%- endfor %}
+  {%- endfor %}
+  {%- endfor %}
+  {%- else -%}
+    - {{ remote }}
+{%- endif %}
+{%- endfor %}
 {%- endif %}
 #
 #gitfs_remotes: