diff --git a/ChangeLog b/ChangeLog
index 361fc94a3..ea819205d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-12  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* stage2/serial.c (serial_putchar): Handle the character code
+	127 as a backspace. Reported by Florian Engelhardt
+	<f.engelhardt@gmx.net>.
+
 2004-03-12  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	From Boji Tony Kannanthanam <boji.t.kannanthanam@intel.com>:
diff --git a/stage2/serial.c b/stage2/serial.c
index 1920738cf..16c376fa7 100644
--- a/stage2/serial.c
+++ b/stage2/serial.c
@@ -371,6 +371,7 @@ serial_putchar (int c)
 	  break;
 	  
 	case '\b':
+	case 127:
 	  if (serial_x > 0)
 	    serial_x--;
 	  break;