diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32bf7930726..d6fab02a58e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+Paparazzi v5.8.2_stable
+=======================
+
+Maintenance release.
+
+- ground_segment: fix ant_track compilation
+- docker: use Ubuntu 16.04 and various fixes
+- energy ctrl: fix accel conversion for correct vdot
+- system: update udev rules to detect Lisa/M v2.1 correctly
+- cockpit: workaround lablgtk 2.18 Debian/Ubuntu bug
+- modules: fix gps_ublox for fixedwings
+
 Paparazzi v5.8.1_stable
 =======================
 
diff --git a/paparazzi_version b/paparazzi_version
index 804489a309e..15b294dce64 100755
--- a/paparazzi_version
+++ b/paparazzi_version
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEF_VER=v5.8.1_stable
+DEF_VER=v5.8.2_stable
 
 # First try git describe (if running on a git repo),
 # then use default version from above (for release tarballs).