diff --git a/salt/files/minion.d/_defaults.conf b/salt/files/minion.d/_defaults.conf
index 14f6fba..67d4b11 100644
--- a/salt/files/minion.d/_defaults.conf
+++ b/salt/files/minion.d/_defaults.conf
@@ -452,21 +452,21 @@ file_roots:
 # exist in that repo as *local* refs.
 {% if 'gitfs_remotes' in minion -%}
 gitfs_remotes:
-{% for remote in minion['gitfs_remotes'] %}
-{% if remote is mapping %}
-  {% for repo, children in remote.iteritems() %}
+{%- for remote in minion['gitfs_remotes'] %}
+{%- if remote is iterable and remote is not string %}
+  {%- for repo, children in remote.iteritems() %}
     - {{ repo }}:
-  {% for child in children %}
-    {% for key, value in child.iteritems() %}
+  {%- for child in children %}
+    {%- for key, value in child.iteritems() %}
       - {{ key }}: {{ value }}
-    {% endfor %}
-  {% endfor %}
-  {% endfor %}
-  {% else %}
+    {%- endfor -%}
+  {%- endfor -%}
+  {%- endfor -%}
+  {%- else %}
     - {{ remote }}
-{% endif %}
-{% endfor %}
-{% endif %}
+{%- endif -%}
+{%- endfor -%}
+{%- endif -%}
 #
 #gitfs_remotes:
 #  - git://github.com/saltstack/salt-states.git