diff --git a/configure.ac b/configure.ac
index 13224cf6ea29..66b5e5350ef2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 ##
 AC_PREREQ([2.69])
 
-AC_INIT([frr], [8.4.1], [https://github.com/frrouting/frr/issues])
+AC_INIT([frr], [8.4.2], [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 fa726ab33b76..94994575b97d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+frr (8.4.2-0) unstable; urgency=medium
+
+  * New upstream release FRR 8.4.2
+
+ -- Jafar Al-Gharaibeh <jafar@atcorp.com>  Mon, 09 Jan 2023 10:00:00 +0500
+
 frr (8.4.1-0) unstable; urgency=medium
 
   * New upstream release FRR 8.4.1
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index f0c60e92d9cc..cca62444e335 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -793,7 +793,32 @@ sed -i 's/ -M rpki//' %{_sysconfdir}/frr/daemons
 
 %changelog
 
-* Thu Nov 17 2022 Martin Winter <mwinter@opensourcerouting.org> - %{version}
+* Mon Jan 09 2023 Martin Winter <mwinter@opensourcerouting.org> - %{version}
+
+* Mon Jan 09 2023 Jafar Al-Gharaibeh <jafar@atcorp.com> - 8.4.2
+- bfdd: fix ipv4 socket source selection
+- bgpd : fix crash for `set ipv4/ipv6 vpn next-hop` command
+- bgpd: stop overriding nexthop when bgp unnumbered
+- bgpd: fix aggregated routes are withdrawn abnormally
+- bgpd: fix a few memory leaks
+- build: enable pim6d by default
+- build: fix sed regex in lua macro
+- doc : add freebsd 13 build docs
+- isisd: fix memory leak
+- lib:  disable vrf before terminating interfaces
+- lib: do not log `echo ping` commands from watchfrr
+- ospf6d:  fix infinite loop when adding asbr route
+- ospfd: fix rfc conformance test cases 25.19 and 27.6
+- ospfd: fix typo and report the P2P link name in the warning
+- ospfd: report the router IP with opaque capability mismatch
+- ospfd: fix memory leak
+- pimd: consistently ignore prefix list mask len
+- staticd: do not crash when modifying an existing static route with color
+- zebra: free all memory associated ctx->u.iptable.interface_name_list
+- zebra: fix tracepoint changes for lttng
+- zebra: free up route map name memory on vrf deletion event
+- zebra: use `mpls enable`, not `mpls` when generating a config
+- tools: Ignore agentx command for frr-reload.py
 
 * Thu Nov 17 2022 Jafar Al-Gharaibeh <jafar@atcorp.com> - 8.4.1
 - zebra: reuse netinet/if_ether.h to avoid redefinition of struct ethhdr