diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index a582b95..f2ba333 100644
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-20 Nicolas Deffayet <nicolas@deffayet.com>
+
+	* vtysh.c: (vtysh_write_terminal) Write 'end' when done,
+	  to be consistent with telnet vty, and expected by tools
+	  like rancid.
+
 2007-05-01 David L Stevens <dlstevens@us.ibm.com>
 
 	* vtysh/extract.pl.in: added VTYSH_ZEBRA flag for route-map and
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 777a7ac..c7efa91 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1709,6 +1709,8 @@
 
   vtysh_config_dump (fp);
 
+  vty_out (vty, "end%s", VTY_NEWLINE);
+  
   if (vtysh_pager_name && fp)
     {
       fflush (fp);