diff --git a/ChangeLog b/ChangeLog
index 819dfb95..8d8056d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-31 Joerg Wunsch <j@uriah.heep.sax.de>
+
+	Fix for bug #16627: Butterfly programmer does not reset after
+	programming
+	* butterfly.c: Wait for the device's response after sending
+	an "E" command.
+
 2006-08-31 Joerg Wunsch <j@uriah.heep.sax.de>
 
 	Tentative fix for bug #16156: Problem with Si-Prog
diff --git a/butterfly.c b/butterfly.c
index ce3aad73..26728065 100644
--- a/butterfly.c
+++ b/butterfly.c
@@ -389,8 +389,9 @@ static void butterfly_close(PROGRAMMER * pgm)
 {
   no_show_func_info();
 
-  /* "exit programmer" added by Martin Thomas 2/2004 */
+  /* "exit programmer" */
   butterfly_send(pgm, "E", 1);
+  butterfly_vfy_cmd_sent(pgm, "exit bootloader");
 
   serial_close(pgm->fd);
   pgm->fd = -1;