diff --git a/extra/echo-server/echo-server.factor b/extra/echo-server/echo-server.factor
index 08d1b8abf0..3807b8cee7 100644
--- a/extra/echo-server/echo-server.factor
+++ b/extra/echo-server/echo-server.factor
@@ -1,15 +1,15 @@
 ! Copyright (C) 2012 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license.
 
-USING: accessors kernel io io.encodings.utf8 io.servers ;
+USING: accessors kernel io io.encodings.binary io.servers ;
 
 IN: echo-server
 
 : echo-loop ( -- )
-    readln [ write "\r\n" write flush echo-loop ] when* ;
+    1024 read-partial [ write flush echo-loop ] when* ;
 
 : <echo-server> ( port -- server )
-    utf8 <threaded-server>
+    binary <threaded-server>
         swap >>insecure
         "echo.server" >>name
         [ echo-loop ] >>handler ;