diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6214d715b37..7ac2582e64c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-25  Richard Stallman  <rms@gnu.org>
+
+	* comint.el (comint-mode-map): Explicitly bind `delete' and `kp-delete'
+	so they never do EOF.
+
 2007-12-23  Richard Stallman  <rms@gnu.org>
 
 	* dired-aux.el: Load dired.el at run time too.
diff --git a/lisp/comint.el b/lisp/comint.el
index 047cc3b80fb..96c36f3496f 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -453,6 +453,10 @@ executed once when the buffer is created."
     (define-key map "\e\C-l" 	  'comint-show-output)
     (define-key map "\C-m" 	  'comint-send-input)
     (define-key map "\C-d" 	  'comint-delchar-or-maybe-eof)
+    ;; The following two are standardly aliased to C-d,
+    ;; but they should never do EOF, just delete.
+    (define-key map [delete] 	  'delete-char)
+    (define-key map [kp-delete]	  'delete-char)
     (define-key map "\C-c " 	  'comint-accumulate)
     (define-key map "\C-c\C-x" 	  'comint-get-next-from-history)
     (define-key map "\C-c\C-a" 	  'comint-bol-or-process-mark)