diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index 8256c1c..b6df396 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,6 @@
+2004-02-12  Hasso Tepper  <hasso@estpak.ee>
+	* zserv.c: Added "ipv6 forwarding" command.
+
 2004-01-08  Greg Troxel  <gdt@fnord.ir.bbn.com>
 
 	* kernel_socket.c (kernel_read): Use sockaddr_storage in buffer
diff --git a/zebra/zserv.c b/zebra/zserv.c
index 3ea1a16..0f30a55 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -1902,12 +1902,30 @@
   return CMD_SUCCESS;
 }
 
+DEFUN (ipv6_forwarding,
+       ipv6_forwarding_cmd,
+       "ipv6 forwarding",
+       IPV6_STR
+       "Turn on IPv6 forwarding")
+{
+  int ret;
+
+  ret = ipforward_ipv6_on ();
+  if (ret != 0)
+    {
+      vty_out (vty, "Can't turn on IPv6 forwarding%s", VTY_NEWLINE);
+      return CMD_WARNING;
+    }
+
+  return CMD_SUCCESS;
+}
+
 DEFUN (no_ipv6_forwarding,
        no_ipv6_forwarding_cmd,
        "no ipv6 forwarding",
        NO_STR
-       IP_STR
-       "Doesn't forward IPv6 protocol packet")
+       IPV6_STR
+       "Turn off IPv6 forwarding")
 {
   int ret;
 
@@ -1985,6 +2003,7 @@
 #ifdef HAVE_IPV6
   install_element (VIEW_NODE, &show_ipv6_forwarding_cmd);
   install_element (ENABLE_NODE, &show_ipv6_forwarding_cmd);
+  install_element (CONFIG_NODE, &ipv6_forwarding_cmd);
   install_element (CONFIG_NODE, &no_ipv6_forwarding_cmd);
 #endif /* HAVE_IPV6 */