diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 6dc1e7e012..f90bed9dfb 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-09 Akihiro Mizutani <mizutani@net-chef.net>
+
+	* bgp_vty.c: Make "exit-address-family" work in IPv4 unicast address
+	  family node.
+
 2005-04-08 Martin Ling <martin-quagga@earth.li>
 
 	* bgp_aspath.[ch], bgp_route.c, bgp_vty.c, bgpd.[ch]: Allow to enable
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index f7a41f5bd0..06c4abdbc6 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -3954,7 +3954,8 @@ DEFUN (exit_address_family,
        "exit-address-family",
        "Exit from Address Family configuration mode\n")
 {
-  if (vty->node == BGP_IPV4M_NODE
+  if (vty->node == BGP_IPV4_NODE
+      || vty->node == BGP_IPV4M_NODE
       || vty->node == BGP_VPNV4_NODE
       || vty->node == BGP_IPV6_NODE)
     vty->node = BGP_NODE;