diff --git a/README.md b/README.md
index e2f8185..5f83a4b 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Board                          |  Connectivity     | Storage for credentials and
 `Embedded Planet EP_AGORA`          | Cellular          | SPIF                    | Build-only
 `ST NUCLEO_H743ZI2`                 | Ethernet          | Internal Flash          | Build-only
 `ST NUCLEO_L4R5ZI`                  | Wi-Fi ESP8266     | Internal Flash          | Build-only
+`Nuvoton NUMAKER_IOT_M487`          | Wi-Fi ESP8266     | SD card (NUSD)          | Build-only
 
 Build-only = This target is currently verified only via compilation, and is not verified at runtime.
 
diff --git a/bootloader/mbed-bootloader-m487_iot-block_device-kvstore-v4.1.0.bin b/bootloader/mbed-bootloader-m487_iot-block_device-kvstore-v4.1.0.bin
new file mode 100644
index 0000000..08d13f6
Binary files /dev/null and b/bootloader/mbed-bootloader-m487_iot-block_device-kvstore-v4.1.0.bin differ
diff --git a/drivers/storage/COMPONENT_NUSD.lib b/drivers/storage/COMPONENT_NUSD.lib
new file mode 100644
index 0000000..e880349
--- /dev/null
+++ b/drivers/storage/COMPONENT_NUSD.lib
@@ -0,0 +1 @@
+https://github.com/OpenNuvoton/NuMaker-mbed-SD-driver/#56406071a4468a8302c0717a4467a241d152ade2
diff --git a/mbed_app.json b/mbed_app.json
index c0e38b7..07bf149 100644
--- a/mbed_app.json
+++ b/mbed_app.json
@@ -182,6 +182,37 @@
             "esp8266.cts"                               : "PA_11",
             "esp8266.provide-default"                   : true
         },
+        "NUMAKER_IOT_M487": {
+            "target.extra_labels_add"                   : ["PSA"],
+            "target.network-default-interface-type"     : "WIFI",
+            "target.bootloader_img"                     : "bootloader/mbed-bootloader-m487_iot-block_device-kvstore-v4.1.0.bin",
+            "bootloader-size"                           : "(64*1024)",
+            "target.header_offset"                      : "0x12000",
+            "target.app_offset"                         : "0x12400",
+            "target.components_add"                     : ["NUSD"],
+            "nusd.provide-default-blockdevice"          : true,
+            "nusd.provide-kvstore-other-blockdevice"    : true,
+            "update-client.bootloader-details"          : "0x0",
+            "update-client.application-details"         : "0x12000",
+            "update-client.storage-address"             : "(1024*1024*64)",
+            "update-client.storage-size"                : "((MBED_ROM_START + MBED_ROM_SIZE - APPLICATION_ADDR) * MBED_CONF_UPDATE_CLIENT_STORAGE_LOCATIONS)",
+            "update-client.storage-locations"           : 1,
+            "mbed-cloud-client.update-storage"          : "ARM_UCP_FLASHIAP_BLOCKDEVICE",
+            "storage.storage_type"                      : "FILESYSTEM",
+            "storage_filesystem.filesystem"             : "LITTLE",
+            "storage_filesystem.blockdevice"            : "other",
+            "storage_filesystem.internal_base_address"  : "(MBED_ROM_START + MBED_BOOTLOADER_SIZE)",
+            "storage_filesystem.rbp_internal_size"      : "(2*4*1024)",
+            "storage_filesystem.external_base_address"  : "(0x0)",
+            "storage_filesystem.external_size"          : "(1024*1024*64)",
+            "esp8266.tx"                                : "PH_8",
+            "esp8266.rx"                                : "PH_9",
+            "esp8266.rts"                               : "A2",
+            "esp8266.cts"                               : "A3",
+            "esp8266.rst"                               : "PH_3",
+            "esp8266.provide-default"                   : true,
+            "target.macros_add"                         : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS_SW_TRNG_PSA.h\"", "MBEDTLS_PSA_CRYPTO_C", "MBEDTLS_ENTROPY_NV_SEED", "PAL_USE_HW_TRNG=0", "ESP8266_SEND_TIMEOUT=8000"]
+        },
         "DISCO_L475VG_IOT01A": {
             "target.macros_add"                         : ["MBEDTLS_USER_CONFIG_FILE=\"mbedTLSConfig_mbedOS.h\""],
             "target.network-default-interface-type"     : "WIFI",