diff --git a/appveyor.yml b/appveyor.yml
index 197c372..2fe420d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,7 +9,7 @@ environment:
 
 install:
   - cmd: git submodule update --init --recursive
-  - cmd: SET PATH=%PATH%;C:\Python36\Scripts
+  - cmd: SET PATH=C:\Python36\Scripts;%PATH%
   - cmd: pip3 install -U https://github.com/platformio/platformio/archive/develop.zip
   - cmd: platformio platform install file://.
 
diff --git a/boards/lplm4f120h5qr.json b/boards/lplm4f120h5qr.json
index 81a4155..e4f2602 100644
--- a/boards/lplm4f120h5qr.json
+++ b/boards/lplm4f120h5qr.json
@@ -1,10 +1,12 @@
 {
   "build": {
+    "arduino":{
+      "ldscript": "lm4fcpp_blizzard.ld"
+    },
     "core": "tivac",
     "cpu": "cortex-m4",
     "extra_flags": "-DENERGIA_ARCH_TIVAC -DENERGIA_EK_TM4C123GXL",
     "f_cpu": "80000000L",
-    "ldscript": "lm4fcpp_blizzard.ld",
     "mcu": "lplm4f120h5qr",
     "variant": "EK-TM4C123GXL"
   },
diff --git a/boards/lptm4c1230c3pm.json b/boards/lptm4c1230c3pm.json
index 7bd84f7..cf247bf 100644
--- a/boards/lptm4c1230c3pm.json
+++ b/boards/lptm4c1230c3pm.json
@@ -1,10 +1,12 @@
 {
   "build": {
+    "arduino":{
+      "ldscript": "lm4fcpp_blizzard.ld"
+    },
     "core": "tivac",
     "cpu": "cortex-m4",
     "extra_flags": "-DENERGIA_ARCH_TIVAC -DENERGIA_EK_TM4C123GXL",
     "f_cpu": "80000000L",
-    "ldscript": "lm4fcpp_blizzard.ld",
     "mcu": "lptm4c1230c3pm",
     "variant": "EK-TM4C123GXL"
   },
diff --git a/boards/lptm4c1294ncpdt.json b/boards/lptm4c1294ncpdt.json
index cb30eee..98efb2f 100644
--- a/boards/lptm4c1294ncpdt.json
+++ b/boards/lptm4c1294ncpdt.json
@@ -1,10 +1,12 @@
 {
   "build": {
+    "arduino":{
+      "ldscript": "lm4fcpp_snowflake.ld"
+    },
     "core": "tivac",
     "cpu": "cortex-m4",
     "extra_flags": "-DENERGIA_ARCH_TIVAC -DENERGIA_EK_TM4C1294XL",
     "f_cpu": "120000000L",
-    "ldscript": "lm4fcpp_snowflake.ld",
     "mcu": "lptm4c1294ncpdt",
     "variant": "EK-TM4C1294XL"
   },
diff --git a/builder/frameworks/energia.py b/builder/frameworks/energia.py
index d2d4a3b..4899c35 100644
--- a/builder/frameworks/energia.py
+++ b/builder/frameworks/energia.py
@@ -85,6 +85,8 @@
     ]
 )
 
+if not env.BoardConfig().get("build.ldscript", ""):
+    env.Replace(LDSCRIPT_PATH=env.BoardConfig().get("build.arduino.ldscript", ""))
 
 #
 # Target: Build Core Library
diff --git a/builder/frameworks/libopencm3 b/builder/frameworks/libopencm3
index 2365654..bc44186 160000
--- a/builder/frameworks/libopencm3
+++ b/builder/frameworks/libopencm3
@@ -1 +1 @@
-Subproject commit 236565457dac1f98c4e107bc40eff3f9ce553eb5
+Subproject commit bc44186a271ca85d08f75833646fb0de3299d379
diff --git a/platform.json b/platform.json
index f4dc9b2..17f21d7 100644
--- a/platform.json
+++ b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-titiva.git"
   },
-  "version": "2.1.0",
+  "version": "2.1.1",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"