diff --git a/HISTORY.rst b/HISTORY.rst
index 93aa775e..4c504320 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,12 @@ Release Notes
 PlatformIO 3.0
 --------------
 
+3.2.1 (2016-12-07)
+~~~~~~~~~~~~~~~~~~
+
+* Changed default `LDF Mode <http://docs.platformio.org/en/latest/librarymanager/ldf.html#ldf-mode>`__
+  from ``chain+`` to ``chain``
+
 3.2.0 (2016-12-07)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/docs b/docs
index 3c9020db..fad663db 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 3c9020db7047e77d70ba12dee115c7edc4cc2025
+Subproject commit fad663db0c599d6e5ef42d90263cfdbf686eca4e
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 15c76cb0..b15e769a 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (3, 2, 0)
+VERSION = (3, 2, 1)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py
index 1b2bf101..8c1dc924 100644
--- a/platformio/builder/tools/piolib.py
+++ b/platformio/builder/tools/piolib.py
@@ -80,7 +80,7 @@ class LibBuilderFactory(object):
 class LibBuilderBase(object):
 
     LDF_MODES = ["off", "chain", "deep", "chain+", "deep+"]
-    LDF_MODE_DEFAULT = "chain+"
+    LDF_MODE_DEFAULT = "chain"
 
     CLASSIC_SCANNER = SCons.Scanner.C.CScanner()
     ADVANCED_SCANNER = SCons.Scanner.C.CScanner(advanced=True)