diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 8e2a397..6101b50 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -10,6 +10,8 @@
 	  (bgp_update_main) Use pcount helpers.
 	  (bgp_clear_route_node) ditto, aslo REMOVED routes don't need
 	  clearing.
+	* bgp_aspath.c: (aspath_gettoken) fix gcc warning about
+	  possible uninitialised usage.
  
 2006-02-02 Paul Jakma <paul.jakma@sun.com>
 
diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
index 2cc5ed3..9fce6e3 100644
--- a/bgpd/bgp_aspath.c
+++ b/bgpd/bgp_aspath.c
@@ -1361,9 +1361,9 @@
 struct aspath *
 aspath_str2aspath (const char *str)
 {
-  enum as_token token;
+  enum as_token token = as_token_unknown;
   u_short as_type;
-  u_short asno;
+  u_short asno = NULL;
   struct aspath *aspath;
   int needtype;