diff --git a/ChangeLog b/ChangeLog
index f3ff993c12..ea287cf6e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun 25 09:31:11 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/erb.rb (ERB::Compiler#compile): output magic comment.
+
 Tue Jun 24 22:14:36 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* vm_eval.c (eval_string_with_cref): preserve parse_in_eval even if
diff --git a/lib/erb.rb b/lib/erb.rb
index 2c7e203923..c6e9129120 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -518,6 +518,7 @@ class ERB
 
     def compile(s)
       out = Buffer.new(self)
+      out.push("# -*- coding: #{s.encoding} -*-")
 
       content = ''
       scanner = make_scanner(s)
diff --git a/version.h b/version.h
index c220792105..027e8cd399 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-06-24"
+#define RUBY_RELEASE_DATE "2008-06-25"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080624
+#define RUBY_RELEASE_CODE 20080625
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_DAY 25
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];