diff --git a/demos/STM8L-STM8L152-DISCOVERY-STVD/cosmic/cosmic.stp b/demos/STM8L-STM8L152-DISCOVERY-STVD/cosmic/cosmic.stp
index 2ddf18f70..20fd5c578 100644
--- a/demos/STM8L-STM8L152-DISCOVERY-STVD/cosmic/cosmic.stp
+++ b/demos/STM8L-STM8L152-DISCOVERY-STVD/cosmic/cosmic.stp
@@ -2152,11 +2152,6 @@ Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\os\ker
 [Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\os\kernel\include\chinline.h]
 ElemType=File
 PathName=..\..\..\os\kernel\include\chinline.h
-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\os\kernel\include\chioch.h
-
-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\os\kernel\include\chioch.h]
-ElemType=File
-PathName=..\..\..\os\kernel\include\chioch.h
 Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\os\kernel\include\chlists.h
 
 [Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\os\kernel\include\chlists.h]
diff --git a/demos/STM8L-STM8L152-DISCOVERY-STVD/raisonance/raisonance.stp b/demos/STM8L-STM8L152-DISCOVERY-STVD/raisonance/raisonance.stp
index 681fdf696..508b7693d 100644
--- a/demos/STM8L-STM8L152-DISCOVERY-STVD/raisonance/raisonance.stp
+++ b/demos/STM8L-STM8L152-DISCOVERY-STVD/raisonance/raisonance.stp
@@ -2100,11 +2100,6 @@ Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\os\ker
 [Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\os\kernel\include\chlists.h]
 ElemType=File
 PathName=..\..\..\os\kernel\include\chlists.h
-Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\os\kernel\include\chioch.h
-
-[Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\os\kernel\include\chioch.h]
-ElemType=File
-PathName=..\..\..\os\kernel\include\chioch.h
 Next=Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\os\kernel\include\chinline.h
 
 [Root.Include Files.Include Files\os.Include Files\os\kernel...\..\..\os\kernel\include\chinline.h]
diff --git a/os/ports/cosmic/STM8/chcore.h b/os/ports/cosmic/STM8/chcore.h
index 895dc717e..ffbac228b 100644
--- a/os/ports/cosmic/STM8/chcore.h
+++ b/os/ports/cosmic/STM8/chcore.h
@@ -218,7 +218,7 @@ struct stm8_startctx {
  * @note    @p id can be a function name or a vector number depending on the
  *          port implementation.
  */
-#define PORT_IRQ_HANDLER(id) @far @interrupt void vector##id(void)
+#define PORT_IRQ_HANDLER(id) @far @interrupt @svlreg void vector##id(void)
 
 /**
  * @brief   Port-related initialization code.
diff --git a/readme.txt b/readme.txt
index a1cf53ffc..b4027bf4f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -85,6 +85,10 @@
 *** 2.5.1 ***
 - FIX: Fixed Data available event not generated in serial_usb driver (bug
   3567992).
+- FIX: Fixed STM32F1x rtc_lld_init glitches rtc on hard reset (bug 3567597)
+  (backported to 2.4.3).
+- FIX: Fixed STM8L, cosmic compiler: c_lreg not saved (bug 3566342)(backported
+  to 2.2.10 and 2.4.3).
 - NEW: Modified the CAN drivers to use the new event flags mechanism, the
   previous flags handling has been removed.
 - NEW: Modified serial and serial_usb drivers to use the new event flags