diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in
index 786493a..480d114 100755
--- a/vtysh/extract.pl.in
+++ b/vtysh/extract.pl.in
@@ -46,7 +46,7 @@
 $ignore{'"address-family ipv4"'} = "ignore";
 $ignore{'"address-family ipv4 (unicast|multicast)"'} = "ignore";
 $ignore{'"address-family ipv6"'} = "ignore";
-$ignore{'"address-family ipv6 unicast"'} = "ignore";
+$ignore{'"address-family ipv6 (unicast|multicast)"'} = "ignore";
 $ignore{'"address-family vpnv4"'} = "ignore";
 $ignore{'"address-family vpnv4 unicast"'} = "ignore";
 $ignore{'"address-family ipv4 vrf NAME"'} = "ignore";
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index fe86083..ad1657f 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -2564,6 +2564,7 @@
 #ifdef HAVE_IPV6
   install_element (BGP_NODE, &address_family_ipv6_cmd);
   install_element (BGP_NODE, &address_family_ipv6_unicast_cmd);
+  install_element (BGP_NODE, &address_family_ipv6_multicast_cmd);
 #endif
   install_element (BGP_VPNV4_NODE, &exit_address_family_cmd);
   install_element (BGP_VPNV6_NODE, &exit_address_family_cmd);