diff --git a/ChangeLog b/ChangeLog
index cf4e4ec34f..0ec114d09e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 31 20:05:56 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/ruby/test_transcode.rb (test_unicode_public_review_issue_121):
+	  fix option1 and 3.
+
 Thu Jul 31 19:54:57 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* transcode.c (get_replacement_character): use U+FFFD as replacement
@@ -17,7 +22,7 @@ Thu Jul 31 17:00:10 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 Thu Jul 31 16:37:03 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* test/rubygems/test_gem_ext_configure_builder.rb
-	  (test_self_build_fail): remove extra newline.
+	  (test_self_build_fail): remove extra newline. [ruby-dev:35704]
 
 Thu Jul 31 15:11:11 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
diff --git a/test/ruby/test_transcode.rb b/test/ruby/test_transcode.rb
index 6aa599b1b9..f7a8aa05d4 100644
--- a/test/ruby/test_transcode.rb
+++ b/test/ruby/test_transcode.rb
@@ -313,13 +313,13 @@ class TestTranscode < Test::Unit::TestCase
   end
   
   def test_unicode_public_review_issue_121 # see http://www.unicode.org/review/pr-121.html
-    # assert_equal("\x00\x61\x00?\x00\x62".force_encoding('UTF-16BE'),
+    # assert_equal("\x00\x61\xFF\xFD\x00\x62".force_encoding('UTF-16BE'),
     #   "\x61\xF1\x80\x80\xE1\x80\xC2\x62".encode('UTF-16BE', 'UTF-8', invalid: :replace)) # option 1
     assert_equal("\x00\x61\xFF\xFD\xFF\xFD\xFF\xFD\x00\x62".force_encoding('UTF-16BE'),
       "\x61\xF1\x80\x80\xE1\x80\xC2\x62".encode('UTF-16BE', 'UTF-8', invalid: :replace)) # option 2
     assert_equal("\x61\x00\xFD\xFF\xFD\xFF\xFD\xFF\x62\x00".force_encoding('UTF-16LE'),
       "\x61\xF1\x80\x80\xE1\x80\xC2\x62".encode('UTF-16LE', 'UTF-8', invalid: :replace)) # option 2
-    # assert_equal("\x00\x61\x00?\x00?\x00?\x00?\x00?\x00?\x00\x62".force_encoding('UTF-16BE'),
+    # assert_equal("\x00\x61\xFF\xFD\xFF\xFD\xFF\xFD\xFF\xFD\xFF\xFD\xFF\xFD\x00\x62".force_encoding('UTF-16BE'),
     # "\x61\xF1\x80\x80\xE1\x80\xC2\x62".encode('UTF-16BE', 'UTF-8', invalid: :replace)) # option 3
   end
 end