diff --git a/ChangeLog b/ChangeLog
index 633b82acce..07bbb348ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
-Sun Jan 27 21:48:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jan 27 22:31:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-mode-set-encoding): automatically insert
 	  encoding magic comment.
 
+	* misc/ruby-mode.el (ruby-mode): set ruby-mode-set-encoding to buffer
+	  local before-save-hook.
+
 Sun Jan 27 19:51:15 2008  Tanaka Akira  <akr@fsij.org>
 
 	* string.c (rb_str_inspect): avoid exception by
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index 92287e9683..20a81f26e1 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -272,6 +272,7 @@ The variable ruby-indent-level controls the amount of indentation.
   (make-local-variable 'add-log-current-defun-function)
   (setq add-log-current-defun-function 'ruby-add-log-current-method)
 
+  (make-local-variable 'before-save-hook)
   (add-hook 'before-save-hook 'ruby-mode-set-encoding)
 
   (run-hooks 'ruby-mode-hook))