diff --git a/README.md b/README.md
index 217890965..c12fe55b6 100644
--- a/README.md
+++ b/README.md
@@ -73,13 +73,14 @@ Use `git clone` or download the project from this page. Note that the master
 branch contains the latest fixes and features, for the latest stable code may be
 best to switch to the latest release tag.
 
-Then follow the instruction at [How to build on Linux][buildlink].
+Then follow the instruction at [How to build on Linux][buildlinuxlink] or
+[How to build on Windows][buildwindowslink].
 
-Unfortunately we don't have yet official instructions to build on other
-platforms, please check the progress for [Windows][issue21] and [Mac][issue150].
+Unfortunately we don't have official instructions to build on Mac yet, please
+check the progress at [issue #150][issue150].
 
-[buildlink]: http://carla.readthedocs.io/en/latest/how_to_build_on_linux
-[issue21]: https://github.com/carla-simulator/carla/issues/21
+[buildlinuxlink]: http://carla.readthedocs.io/en/latest/how_to_build_on_linux
+[buildwindowslink]: http://carla.readthedocs.io/en/latest/how_to_build_on_windows
 [issue150]: https://github.com/carla-simulator/carla/issues/150
 
 Contributing