diff --git a/src/ChangeLog b/src/ChangeLog
index da8b012b3ae..c15cc1efc0c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,16 @@
 2001-09-11  Gerd Moellmann  <gerd@gnu.org>
 
+	* minibuf.c (read_minibuf): Bind inhibit-modification-hooks to t,
+	in addition to read-only.
+
+	* xdisp.c (with_echo_area_buffer): Bind inhibit-modification-hooks
+	to t in addition to read-only.
+
+	* lisp.h (Qinhibit_modification_hooks): Declare.
+
+	* insdel.c (Qinhibit_modification_hooks): New variable.
+	(syms_of_insdel): Initialize and staticpro it.
+
 	* textprop.c (verify_interval_modification): Don't run
 	modification-hooks if inhibit_modification_hooks.
 
diff --git a/src/minibuf.c b/src/minibuf.c
index a87127002bb..78c7c375f7d 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -511,8 +511,9 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
 
   /* Erase the buffer.  */
   {
-    int count1 = specpdl_ptr - specpdl;
+    int count1 = BINDING_STACK_SIZE ();
     specbind (Qinhibit_read_only, Qt);
+    specbind (Qinhibit_modification_hooks, Qt);
     Ferase_buffer ();
     unbind_to (count1, Qnil);
   }