diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index c067b78..af55c6f 100644
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-03 MIYAJIMA Mitsuharu <miyajima.mitsuharu@anchor.jp>
+
+	* extract.pl.in: Fix as-range to match CPP output.
+	* vtysh.c: Add missing router_bgp_view_cmd alias.
+
 2008-07-02 MIYAJIMA Mitsuharu <miyajima.mitsuharu@anchor.jp>
 
 	* CMD_AS_RANGE was being used inside command strings, and thus
diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in
index 52a06f5..0b9ee51 100755
--- a/vtysh/extract.pl.in
+++ b/vtysh/extract.pl.in
@@ -37,8 +37,8 @@
 $ignore{'"router ospf"'} = "ignore";
 $ignore{'"router ospf <0-65535>"'} = "ignore";
 $ignore{'"router ospf6"'} = "ignore";
-$ignore{'"router bgp <1-4294967295>"'} = "ignore";
-$ignore{'"router bgp <1-4294967295> view WORD"'} = "ignore";
+$ignore{'"router bgp " "<1-4294967295>"'} = "ignore";
+$ignore{'"router bgp " "<1-4294967295>" " view WORD"'} = "ignore";
 $ignore{'"router isis WORD"'} = "ignore";
 $ignore{'"router zebra"'} = "ignore";
 $ignore{'"address-family ipv4"'} = "ignore";
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index b508749..bad05d9 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -848,6 +848,16 @@
   return CMD_SUCCESS;
 }
 
+ALIAS_SH (VTYSH_BGPD,
+	  router_bgp,
+	  router_bgp_view_cmd,
+	  "router bgp " CMD_AS_RANGE " view WORD",
+	  ROUTER_STR
+	  BGP_STR
+	  AS_STR
+	  "BGP view\n"
+	  "view name\n")
+
 DEFUNSH (VTYSH_BGPD,
 	 address_family_vpnv4,
 	 address_family_vpnv4_cmd,
@@ -2342,6 +2352,7 @@
 #endif
   install_element (CONFIG_NODE, &router_isis_cmd);
   install_element (CONFIG_NODE, &router_bgp_cmd);
+  install_element (CONFIG_NODE, &router_bgp_view_cmd);
   install_element (BGP_NODE, &address_family_vpnv4_cmd);
   install_element (BGP_NODE, &address_family_vpnv4_unicast_cmd);
   install_element (BGP_NODE, &address_family_ipv4_unicast_cmd);