diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
index 50db276..8181e25 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -1108,6 +1108,8 @@ nodegroups:
 
 #####  Windows Software Repo settings #####
 ###########################################
+# Repo settings for 2015.8+ master used with 2015.8+ Windows minions
+#
 # Location of the repo on the master:
 {{ get_config('winrepo_dir_ng', '/srv/salt/win/repo-ng') }}
 
@@ -1127,6 +1129,29 @@ winrepo_remotes_ng:
 #  - 'https://github.com/saltstack/salt-winrepo-ng.git'
 {% endif %}
 
+# Repo settings for 2015.8+ master used with pre-2015.8 Windows minions
+#
+# Location of the repo on the master:
+{{ get_config('winrepo_dir', '/srv/salt/win/repo') }}
+
+# Location of the master's repo cache file:
+{{ get_config('winrepo_cachefile', 'winrepo.p') }}
+
+# List of git repositories to include with the local repo:
+{% if 'winrepo_remotes' in cfg_master %}
+winrepo_remotes:
+  {% for repo in cfg_master['winrepo_remotes'] %}
+  - {{ repo }}
+  {% endfor %}
+{% elif 'winrepo_remotes' in cfg_salt %}
+winrepo_remotes:
+  {% for repo in cfg_salt['winrepo_remotes'] %}
+  - {{ repo }}
+  {% endfor %}
+{% else %}
+#winrepo_remotes:
+#  - 'https://github.com/saltstack/salt-winrepo.git'
+{% endif %}
 
 #####  Windows Software Repo settings - Pre 2015.8 #####
 ########################################################