diff --git a/doc/topics/installation/windows.rst b/doc/topics/installation/windows.rst
index 9ef7d7a338..067ee64105 100644
--- a/doc/topics/installation/windows.rst
+++ b/doc/topics/installation/windows.rst
@@ -20,40 +20,40 @@ A Salt Minion Windows installer can be found here:
 .. admonition:: Download here
 
     * 0.17.1.1 - Windows Installer bugfix release
-    * http://saltstack.com/downloads/Salt-Minion-0.17.1.1-win32-Setup.exe
-    * http://saltstack.com/downloads/Salt-Minion-0.17.1.1-AMD64-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.17.1.1-win32-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.17.1.1-AMD64-Setup.exe
 
     * 0.17.1
-    * http://saltstack.com/downloads/Salt-Minion-0.17.1-win32-Setup.exe
-    * http://saltstack.com/downloads/Salt-Minion-0.17.1-AMD64-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.17.1-win32-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.17.1-AMD64-Setup.exe
 
     * 0.17.0
-    * http://saltstack.com/downloads/Salt-Minion-0.17.0-win32-Setup.exe
-    * http://saltstack.com/downloads/Salt-Minion-0.17.0-AMD64-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.17.0-win32-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.17.0-AMD64-Setup.exe
 
     * 0.16.3
-    * http://saltstack.com/downloads/Salt-Minion-0.16.3-win32-Setup.exe
-    * http://saltstack.com/downloads/Salt-Minion-0.16.3-AMD64-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.16.3-win32-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.16.3-AMD64-Setup.exe
 
     * 0.16.2
-    * http://saltstack.com/downloads/Salt-Minion-0.16.2-win32-Setup.exe
-    * http://saltstack.com/downloads/Salt-Minion-0.16.2-AMD64-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.16.2-win32-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.16.2-AMD64-Setup.exe
 
     * 0.16.0
-    * http://saltstack.com/downloads/Salt-Minion-0.16.0-win32-Setup.exe
-    * http://saltstack.com/downloads/Salt-Minion-0.16.0-AMD64-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.16.0-win32-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.16.0-AMD64-Setup.exe
 
     * 0.15.3
-    * http://saltstack.com/downloads/Salt-Minion-0.15.3-win32-Setup.exe
-    * http://saltstack.com/downloads/Salt-Minion-0.15.3-AMD64-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.15.3-win32-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.15.3-AMD64-Setup.exe
 
     * 0.14.1
-    * http://saltstack.com/downloads/Salt-Minion-0.14.1-win32-Setup.exe
-    * http://saltstack.com/downloads/Salt-Minion-0.14.1-AMD64-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.14.1-win32-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.14.1-AMD64-Setup.exe
 
     * 0.14.0
-    * http://saltstack.com/downloads/Salt-Minion-0.14.0-win32-Setup.exe
-    * http://saltstack.com/downloads/Salt-Minion-0.14.0-AMD64-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.14.0-win32-Setup.exe
+    * http://docs.saltstack.com/downloads/Salt-Minion-0.14.0-AMD64-Setup.exe
 
 
 The 64bit installer has been tested on Windows 7 64bit and Windows Server
diff --git a/salt/runners/manage.py b/salt/runners/manage.py
index 4c49512703..dbff8bab6d 100644
--- a/salt/runners/manage.py
+++ b/salt/runners/manage.py
@@ -278,7 +278,7 @@ def bootstrap_psexec(hosts='', master=None, version=None, arch='win32',
 
     installer_url
         URL of minion installer executable. Defaults to the latest version from
-        http://saltstack.com/downloads
+        http://docs.saltstack.com/downloads
 
     username
         Optional user name for login on remote computer.
@@ -297,7 +297,7 @@ def bootstrap_psexec(hosts='', master=None, version=None, arch='win32',
     '''
 
     if not installer_url:
-        base_url = 'http://saltstack.com/downloads/'
+        base_url = 'http://docs.saltstack.com/downloads/'
         source = urllib.urlopen(base_url).read()
         salty_rx = re.compile('>(Salt-Minion-(.+?)-(.+)-Setup.exe)</a></td><td align="right">(.*?)\\s*<')
         source_list = sorted([[path, ver, plat, time.strptime(date, "%d-%b-%Y %H:%M")]