diff --git a/HISTORY.rst b/HISTORY.rst
index 6fda35fb..01d4bea2 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,6 +7,8 @@ PlatformIO 2.0
 2.6.2 (2015-12-??)
 ~~~~~~~~~~~~~~~~~~
 
+* Removed ``SCons`` from requirements list. PlatformIO will try to install it
+  automatically, otherwise users need to install it manually
 * Fixed ``ChunkedEncodingError`` when SF connection is broken
   (`issue #356 <https://github.com/platformio/platformio/issues/356>`_)
 
diff --git a/docs/faq.rst b/docs/faq.rst
index f4aa9e26..5a5adf5a 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -103,8 +103,8 @@ Troubleshooting
 Installation
 ~~~~~~~~~~~~
 
-PlatformIO and ``SCons`` aren't installed properly
-''''''''''''''''''''''''''''''''''''''''''''''''''
+``SCons`` is not installed in your system
+'''''''''''''''''''''''''''''''''''''''''
 
 PlatformIO depends on awesome and irreplaceable software construction tool
 named `SCons <http://www.scons.org>`_. PlatformIO Code Builder uses it to build
diff --git a/platformio/exception.py b/platformio/exception.py
index ee7f565d..bd1ec52a 100644
--- a/platformio/exception.py
+++ b/platformio/exception.py
@@ -193,9 +193,10 @@ class CIBuildEnvsEmpty(PlatformioException):
 
 class SConsNotInstalledError(PlatformioException):
 
-    MESSAGE = "The PlatformIO and `scons` aren't installed properly. "\
+    MESSAGE = "SCons is not installed in your system. "\
         "More details in FAQ/Troubleshooting section: "\
-        "http://docs.platformio.org/en/latest/faq.html"
+        "http://docs.platformio.org/en/latest/faq.html"\
+        "#scons-is-not-installed-in-your-system"
 
 
 class UpgradeError(PlatformioException):
diff --git a/setup.py b/setup.py
index c7968fd5..810d5b0b 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,9 @@ install_requires = [
 if system() == "Windows":
     install_requires.append("colorama")
 
-if (not util.test_scons() and not util.install_scons()) or util.scons_in_pip():
+if not util.test_scons():
+    util.install_scons()
+elif util.scons_in_pip():
     install_requires.append("scons")
 
 setup(