diff --git a/ChangeLog b/ChangeLog
index fc21df9e9f..ac6bb9e567 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-Sun Sep 27 11:58:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Sep 27 12:01:42 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_buf_cat2): optimize since all second arguments are
+	  constant literals.
+
+	* string.c (str_cat_char): unused now.
 
 	* string.c (rb_hash_{uint{32,},end}): removed.
 
diff --git a/string.c b/string.c
index ad3efae76f..a70bbaab5e 100644
--- a/string.c
+++ b/string.c
@@ -1741,11 +1741,7 @@ str_buf_cat(VALUE str, const char *ptr, long len)
     return str;
 }
 
-static VALUE
-str_buf_cat2(VALUE str, const char *ptr)
-{
-    return str_buf_cat(str, ptr, strlen(ptr));
-}
+#define str_buf_cat2(str, ptr) str_buf_cat(str, (ptr), strlen(ptr))
 
 VALUE
 rb_str_buf_cat(VALUE str, const char *ptr, long len)
@@ -4022,6 +4018,7 @@ rb_str_to_s(VALUE str)
     return str;
 }
 
+#if 0
 static void
 str_cat_char(VALUE str, unsigned int c, rb_encoding *enc)
 {
@@ -4031,6 +4028,7 @@ str_cat_char(VALUE str, unsigned int c, rb_encoding *enc)
     rb_enc_mbcput(c, s, enc);
     rb_enc_str_buf_cat(str, s, n, enc);
 }
+#endif
 
 /*
  * call-seq: