diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 38cabed3d5..e529232240 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -6836,7 +6836,7 @@ bgp_config_write_family_header (struct vty *vty, afi_t afi, safi_t safi,
   if (*write)
     return;
 
-  vty_out (vty, " address-family ");
+  vty_out (vty, "!%s address-family ", VTY_NEWLINE);
 
   if (afi == AFI_IP)
     {