diff --git a/lib/ChangeLog b/lib/ChangeLog
index 8c69a9a..fd6e20b 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-22 Hugo Santos <hsantos@av.it.pt>
+
+	* command.h: (enum node_type) Add BGP_IPV6M_NODE 
+	* command.c: (node_parent) Handle BGP_IPV6M_NODE node
+	  (config_exit, config_end) ditto
+	* vty.c: (vty_end_config) Handle BGP_IPV6M_NODE node
+	
 2005-08-10  Greg Troxel  <gdt@fnord.ir.bbn.com>
 
 	* getopt.h: Don't declare getopt (rather than getopt_long), since
diff --git a/lib/command.c b/lib/command.c
index 83b8a95..f642359 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -1,5 +1,5 @@
 /*
-   $Id: command.c,v 1.48 2005/05/06 21:25:49 paul Exp $
+   $Id: command.c,v 1.49 2005/08/22 22:39:56 paul Exp $
  
    Command interpreter routine for virtual terminal [aka TeletYpe]
    Copyright (C) 1997, 98, 99 Kunihiro Ishiguro
@@ -1966,6 +1966,7 @@
     case BGP_IPV4_NODE:
     case BGP_IPV4M_NODE:
     case BGP_IPV6_NODE:
+    case BGP_IPV6M_NODE:
       ret = BGP_NODE;
       break;
     case KEYCHAIN_KEY_NODE:
@@ -2391,6 +2392,7 @@
     case BGP_IPV4_NODE:
     case BGP_IPV4M_NODE:
     case BGP_IPV6_NODE:
+    case BGP_IPV6M_NODE:
       vty->node = BGP_NODE;
       break;
     case KEYCHAIN_KEY_NODE:
@@ -2430,6 +2432,7 @@
     case BGP_IPV4_NODE:
     case BGP_IPV4M_NODE:
     case BGP_IPV6_NODE:
+    case BGP_IPV6M_NODE:
     case RMAP_NODE:
     case OSPF_NODE:
     case OSPF6_NODE:
diff --git a/lib/command.h b/lib/command.h
index 5328888..02d96a4 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -81,6 +81,7 @@
   BGP_IPV4_NODE,		/* BGP IPv4 unicast address family.  */
   BGP_IPV4M_NODE,		/* BGP IPv4 multicast address family.  */
   BGP_IPV6_NODE,		/* BGP IPv6 address family */
+  BGP_IPV6M_NODE,		/* BGP IPv6 multicast address family. */
   OSPF_NODE,			/* OSPF protocol mode */
   OSPF6_NODE,			/* OSPF protocol for IPv6 mode */
   ISIS_NODE,			/* ISIS protocol mode */
diff --git a/lib/vty.c b/lib/vty.c
index e429ef1..540f7b9 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -685,6 +685,7 @@
     case BGP_IPV4_NODE:
     case BGP_IPV4M_NODE:
     case BGP_IPV6_NODE:
+    case BGP_IPV6M_NODE:
     case RMAP_NODE:
     case OSPF_NODE:
     case OSPF6_NODE: