diff --git a/ChangeLog b/ChangeLog
index f4418d092a..bccf408a44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Sep 15 18:25:15 2007  Kouhei Sutou  <kou@cozmixng.org>
+
+	* string.c (rb_str_rstrip_bang): fixed too much rstrip. [ruby-dev:31786]
+
 Sat Sep 15 17:32:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (parser_initialize): set default encoding.  [ruby-dev:31787]
diff --git a/string.c b/string.c
index e20007f0b9..0a50f174fe 100644
--- a/string.c
+++ b/string.c
@@ -4374,6 +4374,7 @@ rb_str_rstrip_bang(VALUE str)
 	}
 	s += rb_enc_codelen(cc, enc);
     }
+    if (!space_seen) t = s;
     if (t < e) {
 	rb_str_modify(str);
 	STR_SET_LEN(str, t-RSTRING_PTR(str));