diff --git a/docs/_static/msys2-terminal-window.png b/docs/_static/msys2-terminal-window.png
index d33d9dea1a..e90a22be59 100644
Binary files a/docs/_static/msys2-terminal-window.png and b/docs/_static/msys2-terminal-window.png differ
diff --git a/docs/en/get-started/eclipse-setup.rst b/docs/en/get-started/eclipse-setup.rst
index 67d3094ae9..9ceb3c7791 100644
--- a/docs/en/get-started/eclipse-setup.rst
+++ b/docs/en/get-started/eclipse-setup.rst
@@ -50,7 +50,7 @@ Project Properties
 
 * Click "Add..." again, and enter name ``IDF_PATH``. The value should be the full path where ESP-IDF is installed.
 
-* Edit the ``PATH`` environment variable. Keep the current value, and append the path to the Xtensa toolchain that will installed as part of IDF setup (``something/xtensa-esp32-elf/bin``) if this is not already listed on the PATH.
+* Edit the ``PATH`` environment variable. Keep the current value, and append the path to the Xtensa toolchain installed as part of IDF setup, if this is not already listed on the PATH. A typical path to the toolchain looks like ``/home/user-name/esp/xtensa-esp32-elf/bin``. Note that you need to add a colon ``:`` before the appended path.
 
 * On macOS, add a ``PYTHONPATH`` environment variable and set it to ``/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages``. This is so that the system Python, which has pyserial installed as part of the setup steps, overrides any built-in Eclipse Python.
 
diff --git a/docs/en/get-started/windows-setup.rst b/docs/en/get-started/windows-setup.rst
index 2085e91082..e2adebde29 100644
--- a/docs/en/get-started/windows-setup.rst
+++ b/docs/en/get-started/windows-setup.rst
@@ -21,7 +21,11 @@ Unzip the zip file to ``C:\`` (or some other location, but this guide assumes ``
 Check it Out
 ============
 
-Open a MSYS2 MINGW32 terminal window by running ``C:\msys32\mingw32.exe``. The environment in this window is a bash shell. 
+Open a MSYS2 MINGW32 terminal window by running ``C:\msys32\mingw32.exe``. The environment in this window is a bash shell. Create a directory named ``esp`` that is a default location to develop ESP32 applications. To do so, run the following shell command::
+
+    mkdir -p ~/esp
+
+By typing ``cd ~/esp`` you can then move to the newly created directory. If there are no error messages you are done with this step.
 
 .. figure:: ../../_static/msys2-terminal-window.png
     :align: center