diff --git a/build-scripts/esp-idf/wamr/CMakeLists.txt b/build-scripts/esp-idf/wamr/CMakeLists.txt
index 5ac04ddc..47ccb055 100644
--- a/build-scripts/esp-idf/wamr/CMakeLists.txt
+++ b/build-scripts/esp-idf/wamr/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 # Set WAMR's build options
-if("${IDF_TARGET}" STREQUAL "esp32c3")
+if("${IDF_TARGET}" STREQUAL "esp32c3" OR "${IDF_TARGET}" STREQUAL "esp32c6")
     set(WAMR_BUILD_TARGET "RISCV32")
 else()
     set(WAMR_BUILD_TARGET "XTENSA")
diff --git a/product-mini/platforms/esp-idf/build_and_run.sh b/product-mini/platforms/esp-idf/build_and_run.sh
index f764a301..7ce1b57a 100755
--- a/product-mini/platforms/esp-idf/build_and_run.sh
+++ b/product-mini/platforms/esp-idf/build_and_run.sh
@@ -6,6 +6,7 @@
 ESP32_TARGET="esp32"
 ESP32C3_TARGET="esp32c3"
 ESP32S3_TARGET="esp32s3"
+ESP32C6_TARGET="esp32c6"
 
 usage ()
 {
@@ -15,6 +16,7 @@ usage ()
         echo "        $0 $ESP32_TARGET"
         echo "        $0 $ESP32C3_TARGET"
         echo "        $0 $ESP32S3_TARGET"
+        echo "        $0 $ESP32C6_TARGET"
         exit 1
 }