diff --git a/src/server/telnet.py b/src/server/telnet.py
index 4b93a6ed4d..c68563b3e2 100644
--- a/src/server/telnet.py
+++ b/src/server/telnet.py
@@ -108,7 +108,7 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
     def _write(self, data):
         "hook overloading the one used in plain telnet"
         #print "_write (%s): %s" % (self.state,  " ".join(str(ord(c)) for c in data))
-        data = data.replace('\n', '\r\n')
+        data = data.rstrip('\r\n') + '\r\n'
         super(TelnetProtocol, self)._write(mccp_compress(self, data))
 
     def sendLine(self, line):