diff --git a/ChangeLog b/ChangeLog
index d17e4ef888..783fb0c375 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 27 21:21:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_startwith): rename startwith? to start_with?,
+	  endwith? to endwith?, respectively.  [ruby-talk:216685]
+
 Wed Sep 27 13:29:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/cgi.rb (CGI::TagMaker::nOE_element_def): replace to_s by
diff --git a/string.c b/string.c
index 9a45d2f5ce..e8468b0791 100644
--- a/string.c
+++ b/string.c
@@ -4512,13 +4512,13 @@ rb_str_rpartition(VALUE str, VALUE sep)
 
 /*
  *  call-seq:
- *     str.startwith?([prefix]+)   => true or false
+ *     str.start_with?([prefix]+)   => true or false
  *  
  *  Returns true if <i>str</i> starts with the prefix given.
  */
 
 static VALUE
-rb_str_startwith(int argc, VALUE *argv, VALUE str)
+rb_str_start_with(int argc, VALUE *argv, VALUE str)
 {
     int i;
 
@@ -4534,13 +4534,13 @@ rb_str_startwith(int argc, VALUE *argv, VALUE str)
 
 /*
  *  call-seq:
- *     str.endwith?([suffix]+)   => true or false
+ *     str.end_with?([suffix]+)   => true or false
  *  
  *  Returns true if <i>str</i> ends with the suffix given.
  */
 
 static VALUE
-rb_str_endwith(int argc, VALUE *argv, VALUE str)
+rb_str_end_with(int argc, VALUE *argv, VALUE str)
 {
     int i;
 
@@ -4899,8 +4899,8 @@ Init_String(void)
     rb_define_method(rb_cString, "ord", rb_str_ord, 0);
 
     rb_define_method(rb_cString, "include?", rb_str_include, 1);
-    rb_define_method(rb_cString, "startwith?", rb_str_startwith, -1);
-    rb_define_method(rb_cString, "endwith?", rb_str_endwith, -1);
+    rb_define_method(rb_cString, "start_with?", rb_str_start_with, -1);
+    rb_define_method(rb_cString, "end_with?", rb_str_end_with, -1);
 
     rb_define_method(rb_cString, "scan", rb_str_scan, 1);