diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/odin_w2_mbedtls_config.h b/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/odin_w2_mbedtls_config.h
deleted file mode 100644
index 926f23b304..0000000000
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/odin_w2_mbedtls_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ODIN_W2_MBEDTLS_CONFIG_H_
-#define _ODIN_W2_MBEDTLS_CONFIG_H_
-
-#define MBEDTLS_ARC4_C
-#define MBEDTLS_DES_C
-#define MBEDTLS_MD4_C
-#define MBEDTLS_MD5_C
-#define MBEDTLS_SHA1_C
-
-#endif /* _ODIN_W2_MBEDTLS_CONFIG_H_ */
diff --git a/targets/targets.json b/targets/targets.json
index a6e3e1ebb2..c4574a8b2a 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -1259,7 +1259,7 @@
         "default_toolchain": "ARM",
         "supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
         "extra_labels": ["STM", "STM32F4", "STM32F439", "STM32F439ZI","STM32F439xx"],
-        "macros": ["HSE_VALUE=24000000", "HSE_STARTUP_TIMEOUT=5000", "CB_INTERFACE_SDIO","CB_CHIP_WL18XX","SUPPORT_80211D_ALWAYS","WLAN_ENABLED","MBEDTLS_USER_CONFIG_FILE=\"sdk/odin_w2_mbedtls_config.h\""],
+        "macros": ["HSE_VALUE=24000000", "HSE_STARTUP_TIMEOUT=5000", "CB_INTERFACE_SDIO","CB_CHIP_WL18XX","SUPPORT_80211D_ALWAYS","WLAN_ENABLED","MBEDTLS_ARC4_C","MBEDTLS_DES_C","MBEDTLS_MD4_C","MBEDTLS_MD5_C","MBEDTLS_SHA1_C"],
         "inherits": ["Target"],
         "device_has": ["ANALOGIN", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES", "TRNG"],
         "features": ["LWIP"],
diff --git a/tools/export/makefile/Makefile.tmpl b/tools/export/makefile/Makefile.tmpl
index 1ab96c32ef..a22cb9c23f 100644
--- a/tools/export/makefile/Makefile.tmpl
+++ b/tools/export/makefile/Makefile.tmpl
@@ -53,8 +53,8 @@ PROJECT := {{name}}
 {% endfor %}
 {% for path in include_paths %}INCLUDE_PATHS += -I{{path}}
 {% endfor %}
-LIBRARY_PATHS :={% for p in library_paths %} -L{{p}} {% endfor %}
-LIBRARIES :={% for lib in libraries %} -l{{lib}} {% endfor %}
+LIBRARY_PATHS :={% for p in library_paths %} {{user_library_flag}}{{p}} {% endfor %}
+LIBRARIES :={% for lib in libraries %} {{lib}} {% endfor %}
 LINKER_SCRIPT := {{linker_script}}
 {%- block additional_variables -%}{% endblock %}
 
diff --git a/tools/export/makefile/__init__.py b/tools/export/makefile/__init__.py
index d29b273d43..41030f54c2 100644
--- a/tools/export/makefile/__init__.py
+++ b/tools/export/makefile/__init__.py
@@ -44,7 +44,8 @@ class Makefile(Exporter):
                           self.resources.c_sources +
                           self.resources.cpp_sources]
 
-        libraries = [splitext(lib)[0][3:] for lib in self.resources.libraries]
+        libraries = [self.prepare_lib(basename(lib)) for lib
+                     in self.resources.libraries]
 
         ctx = {
             'name': self.project_name,
@@ -70,6 +71,7 @@ class Makefile(Exporter):
             'elf2bin_cmd': "\'" + self.toolchain.elf2bin + "\'",
             'link_script_ext': self.toolchain.LINKER_EXT,
             'link_script_option': self.LINK_SCRIPT_OPTION,
+            'user_library_flag': self.USER_LIBRARY_FLAG,
         }
 
         for key in ['include_paths', 'library_paths', 'linker_script',
@@ -108,6 +110,11 @@ class GccArm(Makefile):
     NAME = 'Make-GCC-ARM'
     TOOLCHAIN = "GCC_ARM"
     LINK_SCRIPT_OPTION = "-T"
+    USER_LIBRARY_FLAG = "-L"
+
+    @staticmethod
+    def prepare_lib(libname):
+        return "-l:" + libname
 
 
 class Armc5(Makefile):
@@ -117,6 +124,11 @@ class Armc5(Makefile):
     NAME = 'Make-ARMc5'
     TOOLCHAIN = "ARM"
     LINK_SCRIPT_OPTION = "--scatter"
+    USER_LIBRARY_FLAG = "--userlibpath "
+
+    @staticmethod
+    def prepare_lib(libname):
+        return libname
 
 
 class IAR(Makefile):
@@ -126,3 +138,10 @@ class IAR(Makefile):
     NAME = 'Make-IAR'
     TOOLCHAIN = "IAR"
     LINK_SCRIPT_OPTION = "--config"
+    USER_LIBRARY_FLAG = "-L"
+
+    @staticmethod
+    def prepare_lib(libname):
+        if "lib" == libname[:3]:
+            libname = libname[3:]
+        return "-l" + splitext(libname)[0]