diff --git a/targets/os/riot/Makefile b/targets/os/riot/Makefile
index dfaebd54c7..c6f8473359 100644
--- a/targets/os/riot/Makefile
+++ b/targets/os/riot/Makefile
@@ -47,7 +47,7 @@ ARCHIVES += $(JERRYDIR)/build/lib/libjerry-ext.a
 ARCHIVES += $(JERRYDIR)/build/lib/libjerry-port.a
 
 USEMODULE += shell
-USEMODULE += shell_commands
+USEMODULE += shell_cmds_default
 USEMODULE += posix_sleep
 
 .PHONY: libjerry
diff --git a/targets/os/riot/Makefile.travis b/targets/os/riot/Makefile.travis
index 302ce1eacd..d449c3ca41 100644
--- a/targets/os/riot/Makefile.travis
+++ b/targets/os/riot/Makefile.travis
@@ -27,7 +27,7 @@ install-apt-get-deps:
 
 # Fetch RIOT OS repository.
 install-clone-riot:
-	git clone https://github.com/RIOT-OS/RIOT.git ../RIOT -b 2021.10
+	git clone https://github.com/RIOT-OS/RIOT.git ../RIOT -b 2025.04
 
 # Perform all the necessary (JerryScript-independent) installation steps.
 install-noapt: install-clone-riot
diff --git a/targets/os/riot/source/jerry-main.c b/targets/os/riot/source/jerry-main.c
index 9ca1583c87..f884e46a75 100644
--- a/targets/os/riot/source/jerry-main.c
+++ b/targets/os/riot/source/jerry-main.c
@@ -91,7 +91,7 @@ main (void)
   } now = { .d = jerry_port_current_time () };
   srand (now.u);
   printf ("You are running RIOT on a(n) %s board.\n", RIOT_BOARD);
-  printf ("This board features a(n) %s MCU.\n", RIOT_MCU);
+  printf ("This board features a(n) %s MCU.\n", RIOT_CPU);
 
   /* start the shell */
   char line_buf[SHELL_DEFAULT_BUFSIZE];