diff --git a/NEWS b/NEWS
index 3e70474..174a490 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 * Changes in Quagga 0.96.6
 
+- Zebra no longer enables forwarding by default. If you rely on zebra to
+  enable forwarding make sure to add '<ip|ip6> forwarding' statements
+  to your zebra configuration file.
+
 - All libraries are built and used shared, on platforms where libtool
   supports shared libraries.
 
diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index 0b54f29..82cc951 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-23 Paul Jakma <paul@dishone.st>
+
+	* zserv.c: (zebra_init) remove implicit ip forward enabling
+	
 2004-08-19 Paul Jakma <paul@dishone.st>
 
         * irdp_main.c: update to match sockopt renames.
diff --git a/zebra/zserv.c b/zebra/zserv.c
index 3c582af..4779b64 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -1676,11 +1676,11 @@
 int
 config_write_forwarding (struct vty *vty)
 {
-  if (! ipforward ())
-    vty_out (vty, "no ip forwarding%s", VTY_NEWLINE);
+  if (ipforward ())
+    vty_out (vty, "ip forwarding%s", VTY_NEWLINE);
 #ifdef HAVE_IPV6
-  if (! ipforward_ipv6 ())
-    vty_out (vty, "no ipv6 forwarding%s", VTY_NEWLINE);
+  if (ipforward_ipv6 ())
+    vty_out (vty, "ipv6 forwarding%s", VTY_NEWLINE);
 #endif /* HAVE_IPV6 */
   vty_out (vty, "!%s", VTY_NEWLINE);
   return 0;
@@ -1702,12 +1702,6 @@
   /* Client list init. */
   zebrad.client_list = list_new ();
 
-  /* Forwarding is on by default. */
-  ipforward_on ();
-#ifdef HAVE_IPV6
-  ipforward_ipv6_on ();
-#endif /* HAVE_IPV6 */
-
   /* Make zebra server socket. */
 #ifdef HAVE_TCP_ZEBRA
   zebra_serv ();