diff --git a/ChangeLog b/ChangeLog
index c88cb602f1..9f30781f80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul  9 10:02:45 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/{dl,fiddle}/win32/lib/win32/registry.rb
+	  (Win32::Registry::Error#initialize): use suitable encoding for the
+	  string.
+
 Tue Jul  9 09:46:53 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/dl/win32/lib/win32/registry.rb (Win32::Registry.expand_environ):
diff --git a/ext/dl/win32/lib/win32/registry.rb b/ext/dl/win32/lib/win32/registry.rb
index cca578ce01..abe9e36f9b 100644
--- a/ext/dl/win32/lib/win32/registry.rb
+++ b/ext/dl/win32/lib/win32/registry.rb
@@ -174,7 +174,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
         msg = WCHAR_SPACE * 1024
         len = FormatMessageW.call(0x1200, 0, code, 0, msg, 1024, 0)
         msg = msg[0, len].encode
-        super msg.tr("\r", '').chomp
+        super msg.tr("\r".encode(msg.encoding), '').chomp
       end
       attr_reader :code
     end
diff --git a/ext/fiddle/win32/lib/win32/registry.rb b/ext/fiddle/win32/lib/win32/registry.rb
index 099bfd7751..1c881ee300 100644
--- a/ext/fiddle/win32/lib/win32/registry.rb
+++ b/ext/fiddle/win32/lib/win32/registry.rb
@@ -174,7 +174,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
         msg = WCHAR_SPACE * 1024
         len = FormatMessageW.call(0x1200, 0, code, 0, msg, 1024, 0)
         msg = msg[0, len].encode
-        super msg.tr("\r", '').chomp
+        super msg.tr("\r".encode(msg.encoding), '').chomp
       end
       attr_reader :code
     end