diff --git a/tools/config.sh b/tools/config.sh
index c8c838d6f..d175f0ca6 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -30,6 +30,7 @@ CAMERA_REPO_URL="https://github.com/espressif/esp32-camera.git"
 FACE_REPO_URL="https://github.com/espressif/esp-face.git"
 LITTLEFS_REPO_URL="https://github.com/joltwallet/esp_littlefs.git"
 AR_REPO_URL="https://github.com/$AR_REPO.git"
+RMAKER_REPO_URL="https://github.com/espressif/esp-rainmaker.git"
 
 if [ -n $GITHUB_TOKEN ]; then
 	AR_REPO_URL="https://$GITHUB_TOKEN@github.com/$AR_REPO.git"
diff --git a/tools/update-components.sh b/tools/update-components.sh
index 3c5e48ceb..9173ea232 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -42,3 +42,13 @@ if [ ! -d "$AR_COMPS/esp_littlefs" ]; then
     git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive
 fi
 if [ $? -ne 0 ]; then exit 1; fi
+
+#
+# CLONE/UPDATE ESP-RAINMAKER
+#
+
+if [ ! -d "$AR_COMPS/esp-rainmaker" ]; then
+    git clone $RMAKER_REPO_URL "$AR_COMPS/esp-rainmaker"
+fi
+if [ $? -ne 0 ]; then exit 1; fi
+