diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 55c7a366deb..d894b1ffca0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -10,6 +10,10 @@
 	in place of the file name while working on non-file buffers, just
 	like hack-dir-local-variables already does.  (Bug#19140)
 
+	* textmodes/enriched.el (enriched-encode): Use
+	inhibit-point-motion-hooks in addition to inhibit-read-only.
+	(Bug#18246)
+
 2015-01-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/eieio-core.el (eieio--class-constructor): Rename from
diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index b9d45b3a32f..040a50e3099 100644
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -314,7 +314,8 @@ the region, and the START and END of each region."
 ;;;###autoload
 (defun enriched-encode (from to orig-buf)
   (if enriched-verbose (message "Enriched: encoding document..."))
-  (let ((inhibit-read-only t))
+  (let ((inhibit-read-only t)
+	(inhibit-point-motion-hooks t))
     (save-restriction
       (narrow-to-region from to)
       (delete-to-left-margin)