diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 9dc1adc..d83c345 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-01 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* bgp_vty.c: (bgp_config_write_redistribute) Use new library function
+	  zebra_route_string instead of a local hard-coded table.
+
 2005-09-30 Vincent Jardin <vincent.jardin@6wind.com>
 
 	* bgp_packet.c: fix compilation when DEBUG is used.
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 685ea28..c8d5b2a 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -8510,8 +8510,6 @@
 			       safi_t safi, int *write)
 {
   int i;
-  const char *str[] = { "system", "kernel", "connected", "static", "rip",
-		  "ripng", "ospf", "ospf6", "isis", "bgp"};
 
   /* Unicast redistribution only.  */
   if (safi != SAFI_UNICAST)
@@ -8526,7 +8524,7 @@
 	  bgp_config_write_family_header (vty, afi, safi, write);
 
 	  /* "redistribute" configuration.  */
-	  vty_out (vty, " redistribute %s", str[i]);
+	  vty_out (vty, " redistribute %s", zebra_route_string(i));
 
 	  if (bgp->redist_metric_flag[afi][i])
 	    vty_out (vty, " metric %d", bgp->redist_metric[afi][i]);