diff --git a/ChangeLog b/ChangeLog
index eb219185d7..e9ad7d03ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 19 23:12:07 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* encoding.c: document fix, change default script encoding.
+	  patched by @windwiny [Fixes GH-310]
+
 Sun May 19 17:29:07 2013  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/set.rb (Set#delete_if, Set#keep_if): Add comments.
diff --git a/encoding.c b/encoding.c
index a9a224430d..6fb14a5795 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1700,7 +1700,7 @@ rb_enc_aliases(VALUE klass)
  * All Ruby script code has an associated Encoding which any String literal
  * created in the source code will be associated to.
  *
- * The default script encoding is <code>Encoding::US-ASCII</code>, but it can
+ * The default script encoding is <code>Encoding::UTF-8</code> after v2.0, but it can
  * be changed by a magic comment on the first line of the source code file (or
  * second line, if there is a shebang line on the first). The comment must
  * contain the word <code>coding</code> or <code>encoding</code>, followed