diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index de62763..c067b78 100644
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-02 MIYAJIMA Mitsuharu <miyajima.mitsuharu@anchor.jp>
+
+	* CMD_AS_RANGE was being used inside command strings, and thus
+	  not being expanded, fix by dequoting.
+
 2007-06-20 Nicolas Deffayet <nicolas@deffayet.com>
 
 	* vtysh.c: (vtysh_write_terminal) Write 'end' when done,
diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in
index 789819c..52a06f5 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 CMD_AS_RANGE"'} = "ignore";
-$ignore{'"router bgp CMD_AS_RANGE 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 9f47515..b508749 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -34,6 +34,7 @@
 #include "memory.h"
 #include "vtysh/vtysh.h"
 #include "log.h"
+#include "bgpd/bgp_vty.h"
 
 /* Struct VTY. */
 struct vty *vty;
@@ -838,7 +839,7 @@
 DEFUNSH (VTYSH_BGPD,
 	 router_bgp,
 	 router_bgp_cmd,
-	 "router bgp CMD_AS_RANGE",
+	 "router bgp " CMD_AS_RANGE,
 	 ROUTER_STR
 	 BGP_STR
 	 AS_STR)