diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/PeripheralPins.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/PeripheralPins.c
index 086f5261e3..0e2133ca65 100644
--- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/PeripheralPins.c
+++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/PeripheralPins.c
@@ -23,23 +23,22 @@ const PinMap PinMap_RTC[] = {
 
 /************ADC***************/
 const PinMap PinMap_ADC[] = {
-    /* A0-A5 pins */
     {PTA0,  ADC0_SE12, 0},
+    {PTA7,  ADC0_SE7,  0},
     {PTA8,  ADC0_SE3,  0},
     {PTA9,  ADC0_SE2,  0},
+    {PTA12, ADC0_SE0,  0},
+    
+    {PTB0,  ADC0_SE6,  0},
+    {PTB1,  ADC0_SE5,  0},
+    {PTB2,  ADC0_SE4,  0},
+    {PTB5,  ADC0_SE1,  0},
     {PTB8,  ADC0_SE11, 0},
     {PTB9,  ADC0_SE10, 0},
+    {PTB10, ADC0_SE9,  0},
+    {PTB11, ADC0_SE8,  0},
     {PTB13, ADC0_SE13, 0},
-    /* Rest of pins ADC Mux */
-    {PTB2, ADC0_SE4,  0},
-    {PTB1, ADC0_SE5,  0},
-    {PTB5, ADC0_SE1,  0},
-    {PTA12, ADC0_SE0, 0},
-    {PTB10, ADC0_SE9, 0},
-    {PTB11, ADC0_SE8, 0},
-    {PTB7, ADC0_SE7, 0},
-    {PTB0, ADC0_SE6,  0},
-    {NC,    NC,       0}
+    {NC,    NC,        0}
 };
 
 /************DAC***************/
@@ -50,44 +49,59 @@ const PinMap PinMap_DAC[] = {
 
 /************I2C***************/
 const PinMap PinMap_I2C_SDA[] = {
+    {PTA3, I2C_0, 3},
+    {PTA4, I2C_0, 2},
     {PTB4, I2C_0, 2},
     {NC  , NC   , 0}
 };
 
 const PinMap PinMap_I2C_SCL[] = {
+    {PTA3, I2C_0, 2},
+    {PTA4, I2C_0, 3},
     {PTB3, I2C_0, 2},
     {NC  , NC   , 0}
 };
 /************UART***************/
 const PinMap PinMap_UART_TX[] = {
     {PTB1, UART_0, 2},
+    {PTB2, UART_0, 3},
+    {PTB3, UART_0, 3},
     {NC  , NC    , 0}
 };
 
 const PinMap PinMap_UART_RX[] = {
+    {PTB1, UART_0, 3},
     {PTB2, UART_0, 2},
+    {PTB4, UART_0, 3},
     {NC  , NC    , 0}
 };
 
 /************SPI***************/
 const PinMap PinMap_SPI_SCLK[] = {
-    {PTB0, SPI_0, 3},
-    {NC  , NC   , 0}
+    {PTB0,  SPI_0, 3},
+    {PTB17, SPI_0, 3},
+    {NC   , NC   , 0}
 };
 
 const PinMap PinMap_SPI_MOSI[] = {
-    {PTA7, SPI_0, 3},
-    {NC  , NC   , 0}
+    {PTA7 , SPI_0, 3},
+    {PTB15, SPI_0, 2},
+    {PTB16, SPI_0, 3},
+    {NC   , NC   , 0}
 };
 
 const PinMap PinMap_SPI_MISO[] = {
-    {PTA6, SPI_0, 3},
-    {NC  , NC   , 0}
+    {PTA6 , SPI_0, 3},
+    {PTA7 , SPI_0, 2},
+    {PTB15, SPI_0, 3},
+    {PTB16, SPI_0, 2},
+    {NC   , NC   , 0}
 };
 
 const PinMap PinMap_SPI_SSEL[] = {
-    {PTA5, SPI_0, 3},
-    {NC  , NC   , 0}
+    {PTA5 , SPI_0, 3},
+    {PTA19, SPI_0, 3},
+    {NC   , NC   , 0}
 };
 
 /************PWM***************/
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/PinNames.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/PinNames.h
index 041581fa53..3f067f8c0e 100644
--- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/PinNames.h
+++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/PinNames.h
@@ -78,10 +78,10 @@ typedef enum {
     LED_BLUE  = PTB10,
 
     // mbed original LED naming
-    LED1 = LED_BLUE,
+    LED1 = LED_RED,
     LED2 = LED_GREEN,
-    LED3 = LED_RED,
-    LED4 = LED_RED,
+    LED3 = LED_BLUE,
+    LED4 = LED_BLUE,
 
     // USB Pins
     USBTX = PTB1,
@@ -96,7 +96,7 @@ typedef enum {
     D5 = PTA12,
     D6 = PTB6,
     D7 = PTB7,
-    D8 = PTA10,
+    D8 = PTB10,
     D9 = PTB11,
     D10 = PTA5,
     D11 = PTA7,
@@ -111,6 +111,9 @@ typedef enum {
     A3 = PTA0,
     A4 = PTA9,
     A5 = PTB13,
+    
+    I2C_SCL = D15,
+    I2C_SDA = D14,
 
     // Not connected
     NC = (int)0xFFFFFFFF
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PinNames.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PinNames.h
index 276db0a3dd..5ca0d1517f 100644
--- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PinNames.h
+++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PinNames.h
@@ -232,6 +232,9 @@ typedef enum {
     A3 = PTB3,
     A4 = PTC2,
     A5 = PTC1,
+    
+    I2C_SCL = D15,
+    I2C_SDA = D14,
 
     // Not connected
     NC = (int)0xFFFFFFFF