diff --git a/ChangeLog b/ChangeLog
index 345d8e3fa4..69da317b39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 12 20:45:01 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/protocol.rb (WriteAdapater#puts): must append "\n" to
+	  the string, don't prepend. (ruby-bugs:PR#1280)
+
 Thu Feb 12 20:31:43 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (create_tmpsrc): cpp32 of Borland C++ ignores #error
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index 316f5e51a2..e31244cb1b 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -404,7 +404,7 @@ module Net # :nodoc:
     end
 
     def puts( str = '' )
-      write str.sub(/\n?/, "\n")
+      write str.sub(/\n?\z/, "\n")
     end
 
     def printf( *args )