diff --git a/src/ChangeLog b/src/ChangeLog
index a36953c5729..ac611bfc0e6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-17  Gerd Moellmann  <gerd@gnu.org>
+
+	* keyboard.c (KBD_BUFFER_SIZE) [!HAVE_WINDOW_SYSTEM]: Increase
+	to 4096 because of paste problems reported on GNU/Linux.
+
 2001-07-16  Gerd Moellmann  <gerd@gnu.org>
 
 	* fileio.c (unwind_read): Function removed.
diff --git a/src/keyboard.c b/src/keyboard.c
index 927e986b268..85657dc21be 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -103,7 +103,7 @@ extern int input_fd;
 #define KBD_BUFFER_SIZE 4096
 #endif
 #else	/* No X-windows, character input */
-#define KBD_BUFFER_SIZE 256
+#define KBD_BUFFER_SIZE 4096
 #endif	/* No X-windows */
 
 /* Following definition copied from eval.c */