diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index b33180f..b40f78f 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-19 Paul Jakma <paul.jakma@sun.com>
+
+        * (general) various miscellaneous compiler warning fixes.
+          Remove redundant break statements from switch clauses
+          which return.
+          Remove stray semi-colons which cause empty-statement
+          warnings.
+	* main.c: (sighup) remove private declaration of external
+          function.
+          (main) return from main, not exit, cause it annoys SOS.
+
 2006-01-18 Gunnar Stigen <gunnar.stigen@axxessit.no>
 
 	* zebra_rib.c: Take interface metric into account.
diff --git a/zebra/main.c b/zebra/main.c
index 67108c4..dbe1b53 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -163,9 +163,6 @@
 static void
 sigint (void)
 {
-  /* Decrared in rib.c */
-  void rib_close ();
-
   zlog_notice ("Terminating on signal");
 
   if (!retain_mode)
@@ -378,5 +375,5 @@
     thread_call (&thread);
 
   /* Not reached... */
-  exit (0);
+  return 0;
 }
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 5d9cb2f..a591776 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1497,7 +1497,7 @@
   if (nexthop->type == NEXTHOP_TYPE_BLACKHOLE
       && si->type == STATIC_IPV4_BLACKHOLE)
     return 1;
-  return 0;;
+  return 0;
 }
 
 /* Uninstall static route from RIB. */
@@ -2045,7 +2045,7 @@
       && IPV6_ADDR_SAME (&nexthop->gate.ipv6, &si->ipv6)
       && strcmp (nexthop->ifname, si->ifname) == 0)
     return 1;
-  return 0;;
+  return 0;
 }
 
 static void
diff --git a/zebra/zserv.c b/zebra/zserv.c
index f8bfcfa..aa88ab5 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -138,7 +138,6 @@
       client->t_suicide = thread_add_event(zebrad.master, zserv_delayed_close,
 					   client, 0);
       return -1;
-      break;
     case BUFFER_EMPTY:
       THREAD_OFF(client->t_write);
       break;