diff --git a/ChangeLog b/ChangeLog
index b35128c1e6..8cb6005ac2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 11 15:14:30 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/utf_8.c: Add new alias UTF-8-HFS for UTF8-MAC.
+	  http://www.gnu.org/software/emacs/NEWS.23.2
+
 Tue May 11 13:46:00 2010  Kenta Murata <mrkn@mrkn.jp>
 
 	* ext/bigdecimal/lib/bigdecimal/math.rb (atan),
diff --git a/enc/utf_8.c b/enc/utf_8.c
index f9a97c72dd..0c44a3efeb 100644
--- a/enc/utf_8.c
+++ b/enc/utf_8.c
@@ -449,7 +449,9 @@ ENC_ALIAS("CP65001", "UTF-8")
  * Link: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/BPFileSystem.html
  * Link: http://developer.apple.com/qa/qa2001/qa1235.html
  * Link: http://developer.apple.com/jp/qa/qa2001/qa1235.html
+ * Link: http://www.gnu.org/software/emacs/NEWS.23.2
  */
 ENC_REPLICATE("UTF8-MAC", "UTF-8")
 ENC_ALIAS("UTF-8-MAC", "UTF8-MAC")
+ENC_ALIAS("UTF-8-HFS", "UTF8-MAC") /* Emacs 23.2 */