diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a7faae2c55..551c17b8dda 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-18  Martin Rudalics  <rudalics@gmx.at>
+
+	* textmodes/flyspell.el (flyspell-word-search-backward): Set
+	inhibit-point-motion-hooks to avoid looping due to intangibile
+	text.
+
 2006-10-16  Kim F. Storm  <storm@cua.dk>
 
 	* ido.el (ido-reread-directory): Work in `dir' mode too.
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index ebee4691e8c..e7b95c9619d 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -959,6 +959,7 @@ Mostly we check word delimiters."
 (defun flyspell-word-search-backward (word bound)
   (save-excursion
     (let ((r '())
+	  (inhibit-point-motion-hooks t)
 	  p)
       (while (and (not r) (setq p (search-backward word bound t)))
 	(let ((lw (flyspell-get-word '())))
@@ -973,6 +974,7 @@ Mostly we check word delimiters."
 (defun flyspell-word-search-forward (word bound)
   (save-excursion
     (let ((r '())
+	  (inhibit-point-motion-hooks t)
 	  p)
       (while (and (not r) (setq p (search-forward word bound t)))
 	(let ((lw (flyspell-get-word '())))