diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 7f4f3f1..5176e2b 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-23 Paul Jakma <paul.jakma@sun.com>
+
+	* bgp_vty.c: (neighbor_update_source_cmd) Expand tab completion
+	  to make it clear it takes both address and ifname.
+
 2006-05-12 Paul Jakma <paul.jakma@sun.com>
 
 	* bgp_attr.c: (bgp_packet_attribute) Remove dead code, Coverity
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 520ddf9..ec4b6c2 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -2767,13 +2767,18 @@
   return CMD_SUCCESS;
 }
 
+#define BGP_UPDATE_SOURCE_STR "(A.B.C.D|WORD)"
+#define BGP_UPDATE_SOURCE_HELP_STR \
+  "IPv4 address\n" \
+  "Interface name\n"
+
 DEFUN (neighbor_update_source,
        neighbor_update_source_cmd,
-       NEIGHBOR_CMD2 "update-source WORD",
+       NEIGHBOR_CMD2 "update-source " BGP_UPDATE_SOURCE_STR,
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Source of routing updates\n"
-       "Interface name\n")
+       BGP_UPDATE_SOURCE_HELP_STR)
 {
   return peer_update_source_vty (vty, argv[0], argv[1]);
 }
@@ -2784,8 +2789,7 @@
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
-       "Source of routing updates\n"
-       "Interface name\n")
+       "Source of routing updates\n")
 {
   return peer_update_source_vty (vty, argv[0], NULL);
 }