diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1db638e588..5b9783f6514 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-26  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>
+
+	* cus-edit.el (custom-save-all): Switch to emacs-lisp mode before
+	saving anything to be sure that `forward-sexp' behaves correctly.
+
 2006-09-29  Chong Yidong  <cyd@stupidchicken.com>
 
 	* simple.el (line-move-finish): Ignore field boundaries if the
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 82d2f147874..2f752c5fb66 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4157,6 +4157,8 @@ if only the first line of the docstring is shown."))
 				    recentf-exclude)))
 	 (old-buffer (find-buffer-visiting filename)))
     (with-current-buffer (or old-buffer (find-file-noselect filename))
+      (unless (eq major-mode 'emacs-lisp-mode)
+	(emacs-lisp-mode))
       (let ((inhibit-read-only t))
 	(custom-save-variables)
 	(custom-save-faces))