diff --git a/ChangeLog b/ChangeLog
index 536fbbad35..a348c9a6d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 17 02:50:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_ord): use encoding.
+
 Wed Oct 17 01:57:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* re.c (rb_reg_initialize_m): allow binary encoding option.
diff --git a/string.c b/string.c
index 40450bc17c..0179ab0564 100644
--- a/string.c
+++ b/string.c
@@ -4751,7 +4751,7 @@ rb_str_ord(VALUE s)
 {
     int c;
 
-    c = RSTRING_PTR(s)[0] & 0xff;
+    c = rb_enc_codepoint(RSTRING_PTR(s), RSTRING_END(s), rb_enc_get(s));
     return INT2NUM(c);
 }
 /*