diff --git a/configure.ac b/configure.ac
index 4d6798ca9233..532e062154a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 ##
 AC_PREREQ([2.69])
 
-AC_INIT([frr], [8.5.6], [https://github.com/frrouting/frr/issues])
+AC_INIT([frr], [8.5.7], [https://github.com/frrouting/frr/issues])
 PACKAGE_URL="https://frrouting.org/"
 AC_SUBST([PACKAGE_URL])
 PACKAGE_FULLNAME="FRRouting"
diff --git a/debian/changelog b/debian/changelog
index f14a40ea6674..c491286d43ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+frr (8.5.7-0) unstable; urgency=medium
+
+  * New upstream release FRR 8.5.7
+
+ -- Donatas Abraitis <donatas@opensourcerouting.org>  Mon, 23 Dec 2024 22:35:00 +0300
+
 frr (8.5.6-0) unstable; urgency=medium
 
   * New upstream release FRR 8.5.6
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index 31c5551216e4..e2cbf41c39f6 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -793,7 +793,28 @@ sed -i 's/ -M rpki//' %{_sysconfdir}/frr/daemons
 
 %changelog
 
-* Wed Sep 11 2024 Martin Winter <mwinter@opensourcerouting.org> - %{version}
+* Mon Dec 23 2024 Martin Winter <mwinter@opensourcerouting.org> - %{version}
+
+* Mon Dec 23 2024 Donatas Abraitis <donatas@opensourcerouting.org> - 8.5.7
+- bgpd
+-   Fix memory leak when creating BMP connection with a source interface
+-   Include structure when installing End.DT4/6 SID
+-   Include structure when installing End.DT46 SID
+-   Include structure when removing End.DT4/6 SID
+-   Include structure when removing End.DT46 SID
+- lib
+-   Include SID structure in seg6local nexthop
+-   Take ge/le into consideration when checking the prefix with the prefix-list
+- ospfd
+-   Fix heap corruption vulnerability when parsing SR-Algorithm TLV
+- pimd
+-   Fix access-list memory leak in pimd
+- zebra
+-   Add missing proto translations
+-   Correctly report metrics
+-   Fix crash during reconnect
+-   Fix snmp walk of zebra rib
+-   Let's use memset instead of walking bytes and setting to 0
 
 * Wed Sep 11 2024 Donatas Abraitis <donatas@opensourcerouting.org> - 8.5.6
 - isisd