diff --git a/ChangeLog b/ChangeLog
index 6eb1392085..3f485390a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 20 01:07:13 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (str_extend): should not terminate string interpolation
+	  with newlines in here-docs and newline terminated strings.
+
 Mon Nov 19 17:58:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_mod_modfunc): should follow NODE_ZSUPER link; based
diff --git a/parse.y b/parse.y
index 944df300da..6796d87318 100644
--- a/parse.y
+++ b/parse.y
@@ -2901,7 +2901,7 @@ here_document(term, indent)
 	lex_pbeg = lex_p = RSTRING(line)->ptr;
 	lex_pend = lex_p + RSTRING(line)->len;
       retry:
-	switch (parse_string(term, '\n', '\n')) {
+	switch (parse_string(term, '\n', 0)) {
 	  case tSTRING:
 	  case tXSTRING:
 	    rb_str_cat2(yylval.val, "\n");
@@ -4038,6 +4038,7 @@ str_extend(list, term)
 		    newtok();
 		    return list;
 		}
+	      case '\n':
 		tokadd(c);
 		break;
 	    }
diff --git a/sample/test.rb b/sample/test.rb
index b342fb8541..663a8695e1 100644
--- a/sample/test.rb
+++ b/sample/test.rb
@@ -865,6 +865,13 @@ s = "a string"
 s[0..s.size]="another string"
 test_ok(s == "another string")
 
+s = <<EOS
+#{
+[1,2,3].join(",")
+}
+EOS
+test_ok(s == "1,2,3\n")
+
 test_check "assignment"
 a = nil
 test_ok(defined?(a))