diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
index a1e4608..d0d621c 100644
--- a/bgpd/bgp_aspath.c
+++ b/bgpd/bgp_aspath.c
@@ -1642,7 +1642,7 @@
   /* Check actual AS value. */
   if (isdigit ((int) *p)) 
     {
-      u_short asval;
+      as_t asval;
       
       *token = as_token_asval;
       asval = (*p - '0');
diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index bb9014f..d86937b 100644
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -3053,7 +3053,7 @@
 
 DEFUN (set_aspath_prepend,
        set_aspath_prepend_cmd,
-       "set as-path prepend .<1-65535>",
+       "set as-path prepend ." CMD_AS_RANGE,
        SET_STR
        "Transform BGP AS_PATH attribute\n"
        "Prepend to the as-path\n"
@@ -3091,7 +3091,7 @@
 
 ALIAS (no_set_aspath_prepend,
        no_set_aspath_prepend_val_cmd,
-       "no set as-path prepend .<1-65535>",
+       "no set as-path prepend ." CMD_AS_RANGE,
        NO_STR
        SET_STR
        "Transform BGP AS_PATH attribute\n"
@@ -3100,7 +3100,7 @@
 
 DEFUN (set_aspath_exclude,
        set_aspath_exclude_cmd,
-       "set as-path exclude .<1-65535>",
+       "set as-path exclude ." CMD_AS_RANGE,
        SET_STR
        "Transform BGP AS-path attribute\n"
        "Exclude from the as-path\n"
@@ -3137,7 +3137,7 @@
 
 ALIAS (no_set_aspath_exclude,
        no_set_aspath_exclude_val_cmd,
-       "no set as-path exclude .<1-65535>",
+       "no set as-path exclude ." CMD_AS_RANGE,
        NO_STR
        SET_STR
        "Transform BGP AS_PATH attribute\n"