diff --git a/resources/I-CUBE-Mongoose/Cesanta.I-CUBE-Mongoose.pdsc b/resources/I-CUBE-Mongoose/Cesanta.I-CUBE-Mongoose.pdsc
index 7b8cc999..a0a3c131 100644
--- a/resources/I-CUBE-Mongoose/Cesanta.I-CUBE-Mongoose.pdsc
+++ b/resources/I-CUBE-Mongoose/Cesanta.I-CUBE-Mongoose.pdsc
@@ -8,6 +8,7 @@
   <license>License.txt</license>
   <supportContact>https://mongoose.ws/contact/</supportContact>
   <releases>
+    <release date="2026-05-05" version="7.21.5">See https://github.com/cesanta/mongoose/releases/tag/7.21</release>
     <release date="2026-04-24" version="7.21.4">See https://github.com/cesanta/mongoose/releases/tag/7.21</release>
     <release date="2026-04-08" version="7.21.0">See https://github.com/cesanta/mongoose/releases/tag/7.21</release>
     <release date="2024-03-01" version="7.13.0">See https://github.com/cesanta/mongoose/releases/tag/7.13</release>
@@ -22,23 +23,24 @@
     </condition>
   </conditions>
   <components>
-    <component Cclass="Mongoose" Cgroup="Networking Core" Cversion="7.21.4" maxInstances="1">
+    <component Cclass="Mongoose" Cgroup="Networking Core" Cversion="7.21.5" maxInstances="1">
       <description>Networking Core</description>
       <files>
-        <file category="other" name="README.md"/>
+        <file category="doc" name="README.md"/>
         <file category="header" name="mongoose.h" />
         <file category="sourceC" name="mongoose.c" />
         <file category="header" name="mongoose_config.h"/>
       </files>
     </component>
-    <component Cclass="Mongoose" Cgroup="Web Device Dashboard" Cversion="7.21.4" condition="MongooseCore" maxInstances="1">
+    <component Cclass="Mongoose" Cgroup="Web Device Dashboard" Cversion="7.21.5" condition="MongooseCore" maxInstances="1">
       <description>Web Device Dashboard</description>
       <files>
-        <file category="sourceC" name="mongoose_dashboard.c"/>
-        <file category="sourceC" name="dashboard.html.c"/>
+        <file category="sourceC" name="dashboard.c"/>
+        <file category="sourceC" name="file_data.c"/>
+        <file category="other" name="dashboard.html"/>
       </files>
     </component>
-    <component Cclass="Mongoose" Cgroup="MQTT Client" Cversion="7.21.4" condition="MongooseCore" maxInstances="1">
+    <component Cclass="Mongoose" Cgroup="MQTT Client" Cversion="7.21.5" condition="MongooseCore" maxInstances="1">
       <description>MQTT Client</description>
       <files>
         <file category="sourceC" name="mongoose_mqtt.c"/>
diff --git a/resources/I-CUBE-Mongoose/Makefile b/resources/I-CUBE-Mongoose/Makefile
index 99dafb3e..4cd7b3ba 100644
--- a/resources/I-CUBE-Mongoose/Makefile
+++ b/resources/I-CUBE-Mongoose/Makefile
@@ -1,10 +1,10 @@
-VERSION = 7.21.4
+VERSION = 7.21.5
 REPO_ROOT = ../..
 FILES = Cesanta.I-CUBE-Mongoose.pdsc Release_Notes.html mongoose_config.h README.md
 GENERATED = License.txt \
             mongoose.h mongoose.c \
-            mongoose_dashboard.c dashboard.html.c \
-            mongoose_mqtt.c dashboard.html.c
+            dashboard.c file_data.c dashboard.html \
+            mongoose_mqtt.c
 
 all: Cesanta.I-CUBE-Mongoose.$(VERSION).pack
 
@@ -23,16 +23,19 @@ License.txt:
 Mongoose:
 	mkdir -p Mongoose
 
-mongoose_dashboard.c:
-	cp $(REPO_ROOT)/tutorials/device-dashboard/mongoose_dashboard.c $@
+dashboard.c:
+	cp $(REPO_ROOT)/tutorials/device-dashboard/full/$@ $@
+
+dashboard.html:
+	cp $(REPO_ROOT)/tutorials/device-dashboard/full/$@ $@
+
+file_data.c:
+	make -C $(REPO_ROOT)/tutorials/device-dashboard/full $@
+	cp $(REPO_ROOT)/tutorials/device-dashboard/full/$@ $@
 
 mongoose_mqtt.c:
 	cp $(REPO_ROOT)/tutorials/mqtt/mqtt-client/mongoose_mqtt.c $@
 
-dashboard.html.c:
-	make -C $(REPO_ROOT)/tutorials/device-dashboard dashboard.html.c
-	cp $(REPO_ROOT)/tutorials/device-dashboard/dashboard.html.c $@
-
 mongoose.h: Mongoose
 	cp $(REPO_ROOT)/mongoose.h $@