diff --git a/HISTORY.rst b/HISTORY.rst
index 0e59a8f511..f8353cc72a 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,6 +7,10 @@ PlatformIO 2.0
 2.6.1 (2015-12-??)
 ~~~~~~~~~~~~~~~~~~
 
+* Created public `platformio-pkg-ldscripts <https://github.com/platformio/platformio-pkg-ldscripts.git>`_
+  repository for LD scripts. Moved common configuration for ESP8266 MCU to
+  ``esp8266.flash.common.ld``
+  (`issue #379 <https://github.com/platformio/platformio/issues/379>`_)
 * Fixed reset method for Espressif NodeMCU (ESP-12E Module)
   (`issue #380 <https://github.com/platformio/platformio/issues/380>`_)
 
diff --git a/platformio/__init__.py b/platformio/__init__.py
index e656a7aec8..c70391a757 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.dev0")
+VERSION = (2, 6, "1.dev1")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/main.py b/platformio/builder/main.py
index 26bc853ffa..1f5debdd4c 100644
--- a/platformio/builder/main.py
+++ b/platformio/builder/main.py
@@ -114,6 +114,7 @@
 )
 
 env = DefaultEnvironment()
+env.Prepend(LIBPATH=[join("$PIOPACKAGES_DIR", "ldscripts")])
 
 if "BOARD" in env:
     try:
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index 6db8acfec7..bd8c655842 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -78,7 +78,9 @@ def BuildProgram(env):
 
     env.Append(
         CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format(
-            *pioversion_to_intstr())]
+            *pioversion_to_intstr())],
+        LIBS=deplibs,
+        LIBPATH=["$BUILD_DIR"]
     )
 
     return env.Program(
@@ -86,9 +88,7 @@ def BuildProgram(env):
         env.LookupSources(
             "$BUILDSRC_DIR", "$PROJECTSRC_DIR", duplicate=False,
             src_filter=getenv("PLATFORMIO_SRC_FILTER",
-                              env.get("SRC_FILTER"))),
-        LIBS=env.get("LIBS", []) + deplibs,
-        LIBPATH=env.get("LIBPATH", []) + ["$BUILD_DIR"]
+                              env.get("SRC_FILTER")))
     )