diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21f0390521c..d07a8e16e30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+Paparazzi 5.0.5_stable
+======================
+
+Maintenance release
+
+- fix field order in HFF_DBG message
+- fix altitude in some extra nav routines
+- fix create_module tool
+- fix RCLost macro
+- add GetAltRef() for flight plan compatibility with v5.2
+
+
 Paparazzi 5.0.4_stable
 ======================
 
@@ -9,6 +21,7 @@ Maintenance release
   #[602]  (https://github.com/paparazzi/paparazzi/issues/602)
 - stm32: enable correct error interrupts for i2c2 and i2c3
 
+
 Paparazzi 5.0.3_stable
 ======================
 
diff --git a/sw/ext/libopencm3 b/sw/ext/libopencm3
index 0bf8324c912..67242de60de 160000
--- a/sw/ext/libopencm3
+++ b/sw/ext/libopencm3
@@ -1 +1 @@
-Subproject commit 0bf8324c9128b146ec6a18d62d8f05a5b61a2530
+Subproject commit 67242de60dec0227739cd549e8a78e1a3c15dbf5
diff --git a/sw/ext/luftboot b/sw/ext/luftboot
index 850436456f1..a3e1b20f920 160000
--- a/sw/ext/luftboot
+++ b/sw/ext/luftboot
@@ -1 +1 @@
-Subproject commit 850436456f10e9c025a101b481077f547942d322
+Subproject commit a3e1b20f920ebeb28d20ba7e7b3f41bb2763fb44