diff --git a/HISTORY.rst b/HISTORY.rst
index 7c5e7152..656ebfcd 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -16,6 +16,11 @@ Release History
 * Fixed ``stk500v2_command(): command failed``
   (`issue #238 <https://github.com/platformio/platformio/issues/238>`_)
 
+2.1.2 (2015-06-21)
+------------------
+
+* Fixed broken link to SCons installer
+
 2.1.1 (2015-06-09)
 ------------------
 
diff --git a/scripts/get-platformio.py b/scripts/get-platformio.py
index fd792b25..26b0c932 100644
--- a/scripts/get-platformio.py
+++ b/scripts/get-platformio.py
@@ -101,7 +101,8 @@ def main():
         ("Installing PlatformIO and dependencies", install_pypi_packages, [
             [["setuptools"], ["platformio"], [
                 "--egg",
-                "http://sourceforge.net/projects/scons/files/latest/download"
+                "http://sourceforge.net/projects/platformio-storage/files/"
+                "scons.zip/download"
             ]]
         ])
     ]
diff --git a/tox.ini b/tox.ini
index 49706329..d96bb3d8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ deps =
     isort
     flake8
 commands =
-    pip install --egg http://sourceforge.net/projects/scons/files/latest/download
+    pip install --egg http://sourceforge.net/projects/platformio-storage/files/scons.zip/download
 
 [testenv:docs]
 basepython = python2.7
@@ -48,5 +48,5 @@ passenv = *
 deps = pytest
 commands =
     {envpython} --version
-    pip install --egg http://sourceforge.net/projects/scons/files/latest/download
+    pip install --egg http://sourceforge.net/projects/platformio-storage/files/scons.zip/download
     py.test -v --basetemp="{envtmpdir}" tests