diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70027eeaf3..b5958191cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,31 +1,11 @@
 Not necessarily complete and in no particular order...
 
-- flight plans: don't set nav_pitch to 0 at each stage init
-  [#727] (https://github.com/paparazzi/paparazzi/pull/727)
-- modules: gps_ubx_ucenter: fix version check for Ublox 7
+
+General
+-------
+
 - modules: use VPATH to make it easier to load external modules
   [#760] (https://github.com/paparazzi/paparazzi/pull/760)
-- messages: add GEO_MAG message to send magnetic field
-  [#735] (https://github.com/paparazzi/paparazzi/pull/735)
-- messages: add speed setpoint to GUIDANCE_H_REF_INT message
-  [#763] (https://github.com/paparazzi/paparazzi/issues/763)
-- ardrone2: mag freeze fix
-  [#767] (https://github.com/paparazzi/paparazzi/pull/767)
-- NPS: block and setting messages only parsed for correct AC_ID
-  [#777] (https://github.com/paparazzi/paparazzi/pull/777)
-- boards: add support for navstik
-  [#744] (https://github.com/paparazzi/paparazzi/pull/744)
-- boards: fix PWM on lisa_l
-- peripherals: ms5611: check temp an pressure range
-  [#758] (https://github.com/paparazzi/paparazzi/issues/758)
-- ins: properly define INS_VFF_R_GPS
-  [#741] (https://github.com/paparazzi/paparazzi/issues/741)
-- ins: allow define of VFF_R_SONAR_OF_M
-  [#764] (https://github.com/paparazzi/paparazzi/issues/764)
-- electrical: min bat level check
-  [#745] (https://github.com/paparazzi/paparazzi/issues/745)
-- electrical: fix for negative currents
-  [#753] (https://github.com/paparazzi/paparazzi/issues/753)
 - ground_segement: try to update AGL even if GPS is lost
   [#742] (https://github.com/paparazzi/paparazzi/issues/742)
 - GCS: add exponentiation operator to papgets
@@ -40,6 +20,44 @@ Not necessarily complete and in no particular order...
   [#750] (https://github.com/paparazzi/paparazzi/pull/750)
 - tools: add tool to syncronize video on replay
   [#770] (https://github.com/paparazzi/paparazzi/pull/770)
+  [#776] (https://github.com/paparazzi/paparazzi/pull/776)
+- messages: add GEO_MAG message to send magnetic field
+  [#735] (https://github.com/paparazzi/paparazzi/pull/735)
+- messages: add speed setpoint to GUIDANCE_H_REF_INT message
+  [#763] (https://github.com/paparazzi/paparazzi/issues/763)
+- NPS: block and setting messages only parsed for correct AC_ID
+  [#777] (https://github.com/paparazzi/paparazzi/pull/777)
+
+Airborne
+--------
+
+- fixedwing: correct altitude setpoint during NavGlide
+  [#785] (https://github.com/paparazzi/paparazzi/pull/785)
+- flight plans: don't set nav_pitch to 0 at each stage init
+  [#727] (https://github.com/paparazzi/paparazzi/pull/727)
+- modules: gps_ubx_ucenter: fix version check for Ublox 7
+- ardrone2: mag freeze fix
+  [#767] (https://github.com/paparazzi/paparazzi/pull/767)
+- boards: add support for navstik
+  [#744] (https://github.com/paparazzi/paparazzi/pull/744)
+- boards: fix PWM on lisa_l
+- peripherals: ms5611: check temp an pressure range
+  [#758] (https://github.com/paparazzi/paparazzi/issues/758)
+- imu: aspirin_2_spi: wait 1.5s before configuring mag
+  [#779] (https://github.com/paparazzi/paparazzi/pull/779)
+- imu: body_to_imu adjustable during runtime via settings
+  [#783] (https://github.com/paparazzi/paparazzi/pull/783)
+- ahrs: int_cmpl_quat: fix rate integration range/resolution
+  [#782] (https://github.com/paparazzi/paparazzi/pull/782)
+- ins: properly define INS_VFF_R_GPS
+  [#741] (https://github.com/paparazzi/paparazzi/issues/741)
+- ins: allow define of VFF_R_SONAR_OF_M
+  [#764] (https://github.com/paparazzi/paparazzi/issues/764)
+- electrical: min bat level check
+  [#745] (https://github.com/paparazzi/paparazzi/issues/745)
+- electrical: fix for negative currents
+  [#753] (https://github.com/paparazzi/paparazzi/issues/753)
+
 
 Rotorcraft Firmware
 -------------------