diff --git a/HISTORY.rst b/HISTORY.rst
index 18e141c3..6fda35fb 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,12 @@ Release History
 PlatformIO 2.0
 --------------
 
+2.6.2 (2015-12-??)
+~~~~~~~~~~~~~~~~~~
+
+* Fixed ``ChunkedEncodingError`` when SF connection is broken
+  (`issue #356 <https://github.com/platformio/platformio/issues/356>`_)
+
 2.6.1 (2015-12-18)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/platformio/__init__.py b/platformio/__init__.py
index dfffbd25..d5c4e267 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = (2, 6, 1)
+VERSION = (2, 6, "2.dev0")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/pkgmanager.py b/platformio/pkgmanager.py
index 65054c67..1678e9a2 100644
--- a/platformio/pkgmanager.py
+++ b/platformio/pkgmanager.py
@@ -101,6 +101,7 @@ class PackageManager(object):
         try:
             dlpath = self.download(info['url'], pkg_dir, info['sha1'])
         except (requests.exceptions.ConnectionError,
+                requests.exceptions.ChunkedEncodingError,
                 exception.FDUnrecognizedStatusCode, StopIteration):
             if info['url'].startswith("http://sourceforge.net"):
                 dlpath = self.download(