diff --git a/docs/gen-toolchain-links.py b/docs/gen-toolchain-links.py
index 885817438..b98a68e2c 100644
--- a/docs/gen-toolchain-links.py
+++ b/docs/gen-toolchain-links.py
@@ -56,7 +56,8 @@ def main():
     git clone https://github.com/espressif/crosstool-NG.git
     cd crosstool-NG
     git checkout {}
-    ./bootstrap && ./configure --enable-local && make install
+    git submodule update --init
+    ./bootstrap && ./configure --enable-local && make
 """
 
     platform_info = [
diff --git a/tools/test_idf_tools/test_idf_tools.py b/tools/test_idf_tools/test_idf_tools.py
index 49927d39f..f9f7dc5c9 100755
--- a/tools/test_idf_tools/test_idf_tools.py
+++ b/tools/test_idf_tools/test_idf_tools.py
@@ -71,7 +71,7 @@ class TestUsage(unittest.TestCase):
             idf_tools.main(['list'])
         output = output_stream.getvalue()
 
-        xtensa_esp32_elf_version = 'esp32-2019r1-8.2.0'
+        xtensa_esp32_elf_version = 'esp-2019r2-8.2.0'
         esp32ulp_version = '2.28.51.20170517'
 
         self.assertIn('* xtensa-esp32-elf:', output)
diff --git a/tools/toolchain_versions.mk b/tools/toolchain_versions.mk
index c8b26fe3c..9d3463ff2 100644
--- a/tools/toolchain_versions.mk
+++ b/tools/toolchain_versions.mk
@@ -1,6 +1,6 @@
-SUPPORTED_TOOLCHAIN_COMMIT_DESC = esp32-2019r1
+SUPPORTED_TOOLCHAIN_COMMIT_DESC = esp-2019r2
 SUPPORTED_TOOLCHAIN_GCC_VERSIONS = 8.2.0
 
-CURRENT_TOOLCHAIN_COMMIT_DESC = esp32-2019r1
-CURRENT_TOOLCHAIN_COMMIT_DESC_SHORT = esp32-2019r1
+CURRENT_TOOLCHAIN_COMMIT_DESC = esp-2019r2
+CURRENT_TOOLCHAIN_COMMIT_DESC_SHORT = esp-2019r2
 CURRENT_TOOLCHAIN_GCC_VERSION = 8.2.0
diff --git a/tools/tools.json b/tools/tools.json
index 3204ec3ad..192faf623 100644
--- a/tools/tools.json
+++ b/tools/tools.json
@@ -17,41 +17,41 @@
         "xtensa-esp32-elf-gcc",
         "--version"
       ],
-      "version_regex": "\\(crosstool-NG\\s+(?:crosstool-ng-)?([0-9a-z\\.\\-]+)\\)\\s*([0-9\\.]+)",
+      "version_regex": "\\(crosstool-NG\\s+(?:crosstool-ng-)?([0-9a-zA-Z\\.\\-]+)\\)\\s*([0-9\\.]+)",
       "version_regex_replace": "\\1-\\2",
       "versions": [
         {
           "linux-amd64": {
-            "sha256": "39db59b13f25e83e53c55f56979dbfce77b7f23126ad79de833509ad902d3f0a",
-            "size": 63025996,
-            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-linux-amd64.tar.gz"
+            "sha256": "e6d47c1dbd8c8cbfe37271e5e2aac53ee88c9e347ae937e22bf0c73f530efbdf",
+            "size": 85459985,
+            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz"
           },
           "linux-armel": {
-            "sha256": "4ffd19839fcb241af3111da7c419448b80be3bd844da570e95f8f3d5a7eccf79",
-            "size": 61164309,
-            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-linux-armel.tar.gz"
+            "sha256": "54a199c28f591da2466b21741911bc2ba77ddf82d3d2b66c6ce03c1a0c6835f0",
+            "size": 83647538,
+            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-armel.tar.gz"
           },
           "linux-i686": {
-            "sha256": "85c02a4310bb97ac46e6f943b0de10e9e9572596c7d33d09b6f93f8bace3b784",
-            "size": 65016647,
-            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-linux-i686.tar.gz"
+            "sha256": "36a9648c414dbd1c518c687ce5587d9f8eaa94324f45d92e9ec31a1433a04df8",
+            "size": 87438500,
+            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-i686.tar.gz"
           },
           "macos": {
-            "sha256": "adb256394c948ca424ec6ef1d9bee91baa99a304d8ace8e6701303da952eb007",
-            "size": 69674700,
-            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-macos.tar.gz"
+            "sha256": "dc62be8dd16c6d9d28d64e2b3f831fa208f3548c2ca73cdbcbdf68f474d59521",
+            "size": 92150978,
+            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-macos.tar.gz"
           },
-          "name": "esp32-2019r1-8.2.0",
+          "name": "esp-2019r2-8.2.0",
           "status": "recommended",
           "win32": {
-            "sha256": "ff00dbb02287219a61873c3b2649a50b94e80c82e607c336383f2838abbefbde",
-            "size": 73245169,
-            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-win32.zip"
+            "sha256": "c9d5776a22516f0825a7c68d835ffacc2392f913136893b7646e1288937cc65e",
+            "size": 103850448,
+            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-win32.zip"
           },
           "win64": {
-            "sha256": "ff00dbb02287219a61873c3b2649a50b94e80c82e607c336383f2838abbefbde",
-            "size": 73245169,
-            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-win32.zip"
+            "sha256": "c9d5776a22516f0825a7c68d835ffacc2392f913136893b7646e1288937cc65e",
+            "size": 103850448,
+            "url": "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-win32.zip"
           }
         }
       ]
diff --git a/tools/windows/windows_install_prerequisites.sh b/tools/windows/windows_install_prerequisites.sh
index 993931081..3b74583f9 100644
--- a/tools/windows/windows_install_prerequisites.sh
+++ b/tools/windows/windows_install_prerequisites.sh
@@ -42,10 +42,10 @@ if [ -n "$IDF_PATH" ]; then
 fi
 
 # Automatically download precompiled toolchain, unpack at /opt/xtensa-esp32-elf/
-TOOLCHAIN_ZIP=xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-win32.zip
+TOOLCHAIN_ZIP=xtensa-esp32-elf-gcc8_2_0-esp-2019r2-win32.zip
 echo "Downloading precompiled toolchain ${TOOLCHAIN_ZIP}..."
 cd ~
-curl -LO --retry 10 http://dl.espressif.com/dl/${TOOLCHAIN_ZIP}
+curl -LO --retry 10 https://dl.espressif.com/dl/${TOOLCHAIN_ZIP}
 mkdir -p /opt
 cd /opt
 rm -rf /opt/xtensa-esp32-elf  # for upgrades