diff --git a/ChangeLog b/ChangeLog
index 6534771249..95c81c59cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun  8 04:56:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (error_print): put newline unless multiple line message ends
+	  with a newline.  [ruby-dev:32429]
+
 Sun Jun  8 04:54:36 2008  James Edward Gray II  <jeg2@ruby-lang.org>
 
 	Merged 14070 from trunk.
diff --git a/eval.c b/eval.c
index 080aaf40d6..98493b6990 100644
--- a/eval.c
+++ b/eval.c
@@ -1301,8 +1301,9 @@ error_print()
 		warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
 		warn_print(")\n");
 	    }
-	    if (tail) {
+	    if (tail && elen>len+1) {
 		warn_print2(tail, elen-len-1);
+		if (einfo[elen-1] != '\n') warn_print2("\n", 1);
 	    }
 	}
     }
diff --git a/version.h b/version.h
index a0947d5c3a..f8dd55b0ce 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 154
+#define RUBY_PATCHLEVEL 155
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8