diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 29d0fb0..94eb596 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-10 Paul Jakma <paul.jakma@sun.com>
+
+	* bgp_vty.c: (bgp_vty_init) gcc 4 compile fix. static
+	  function declarations shouldn't be inside functions.
+	* bgp_dump.c: (bgp_dump_interval_add) ditto.
+	
 2005-08-26 Hasso Tepper <hasso at quagga.net>
 
 	* bgp_route.c: Third (?) attempt to fix best selection breakage
diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c
index f5bb5f4..c350e83 100644
--- a/bgpd/bgp_dump.c
+++ b/bgpd/bgp_dump.c
@@ -56,6 +56,8 @@
    MSG_TABLE_DUMP               /* routing table dump */
 };
 
+static int bgp_dump_interval_func (struct thread *);
+
 struct bgp_dump
 {
   enum bgp_dump_type type;
@@ -134,7 +136,6 @@
 static int
 bgp_dump_interval_add (struct bgp_dump *bgp_dump, int interval)
 {
-  static int bgp_dump_interval_func (struct thread *t);
   int interval2, secs_into_day;
   time_t t;
   struct tm *tm;
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index e364206..685ea28 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -8583,11 +8583,11 @@
   1
 };
 
+static void community_list_vty (void);
+
 void
 bgp_vty_init (void)
 {
-  static void community_list_vty (void);
-
   /* Install bgp top node. */
   install_node (&bgp_node, bgp_config_write);
   install_node (&bgp_ipv4_unicast_node, NULL);