diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index 072172b..45c5246 100644
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-22 Hasso Tepper <hasso at quagga.net>
+
+	* vtysh_config.c: No delimiter between "ip forwarding" and "ipv6
+	  forwarding".
+
 2004-12-09 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
 	* vtysh.c: (vtysh_connect) No reason to call geteuid and getegid,
diff --git a/vtysh/vtysh_config.c b/vtysh/vtysh_config.c
index f068b1f..971d2cc 100644
--- a/vtysh/vtysh_config.c
+++ b/vtysh/vtysh_config.c
@@ -283,7 +283,7 @@
   ((I) == ACCESS_NODE || (I) == PREFIX_NODE || (I) == IP_NODE \
    || (I) == AS_LIST_NODE || (I) == COMMUNITY_LIST_NODE || \
    (I) == ACCESS_IPV6_NODE || (I) == PREFIX_IPV6_NODE \
-   || (I) == SERVICE_NODE)
+   || (I) == SERVICE_NODE || (I) == FORWARDING_NODE)
 
 /* Display configuration to file pointer. */
 void