diff --git a/HISTORY.rst b/HISTORY.rst
index a2e01ada..2474c540 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,6 +7,8 @@ PlatformIO 3.0
 3.6.5 (2019-??-??)
 ~~~~~~~~~~~~~~~~~~
 
+* Fixed an issue with slow updating of PlatformIO Core packages on Windows
+
 3.6.4 (2019-01-23)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/platformio/managers/core.py b/platformio/managers/core.py
index 2a516f04..34831b48 100644
--- a/platformio/managers/core.py
+++ b/platformio/managers/core.py
@@ -106,9 +106,10 @@ def update_core_packages(only_check=False, silent=False):
 
 def shutdown_piohome_servers():
     port = 8010
-    while port < 8100:
+    while port < 8050:
         try:
-            requests.get("http://127.0.0.1:%d?__shutdown__=1" % port)
+            requests.get(
+                "http://127.0.0.1:%d?__shutdown__=1" % port, timeout=0.01)
         except:  # pylint: disable=bare-except
             pass
         port += 1