diff --git a/scripts/windows/coco-dev-setup/batch/config/downloads.coco b/scripts/windows/coco-dev-setup/batch/config/downloads.coco
index 1d57fbb71..f8906cbb4 100755
--- a/scripts/windows/coco-dev-setup/batch/config/downloads.coco
+++ b/scripts/windows/coco-dev-setup/batch/config/downloads.coco
@@ -18,6 +18,14 @@
             <vs10redist>http://download.microsoft.com/download/C/6/D/C6D0FD4E-9E53-4897-9B91-836EBA2AACD3/vcredist_x86.exe</vs10redist>
         </general>
     </general>
+    <Win8>
+        <b32>
+            <mongodb>https://fastdl.mongodb.org/win32/mongodb-win32-i386-2.6.0.zip</mongodb>
+        </b32>
+        <b64>
+            <mongodb>https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2008plus-2.6.0.zip</mongodb>
+        </b64>
+    </Win8>
     <Win7>
         <b32>
             <mongodb>https://fastdl.mongodb.org/win32/mongodb-win32-i386-2.6.0.zip</mongodb>
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
index 908399932..2cf69dfda 100755
--- a/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
@@ -8,10 +8,8 @@ for /f "tokens=4-5 delims=. " %%i in ('ver') do set VERSION=%%i.%%j
 if "%version%" == "5.2" ( call:set_os XP )
 if "%version%" == "6.0" ( call:set_os Vista )
 if "%version%" == "6.1" ( call:set_os Win7 )
-:: we handle win8.0 as win7
-if "%version%" == "6.2" ( call:set_os Win7 )
-:: we handle win8.1 as win7
-if "%version%" == "6.3" ( call:set_os Win7 )
+if "%version%" == "6.2" ( call:set_os Win8 )
+if "%version%" == "6.3" ( call:set_os Win8 )
 
 goto:end