diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index acb67992603..61b6660b860 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2001-06-21  Eli Zaretskii  <eliz@is.elta.co.il>
 
+	* toolbar/tool-bar.el (tool-bar-setup): Remove the EXIT button.
+
 	* dabbrev.el (dabbrev--select-buffers): Fix last change.
 
 2001-06-20  Richard M. Stallman  <rms@gnu.org>
diff --git a/lisp/toolbar/tool-bar.el b/lisp/toolbar/tool-bar.el
index e7534c9e4a6..302f6f3d937 100644
--- a/lisp/toolbar/tool-bar.el
+++ b/lisp/toolbar/tool-bar.el
@@ -170,7 +170,9 @@ function."
 ;;; Set up some global items.  Additions/deletions up for grabs.
 
 (defun tool-bar-setup ()
-  (tool-bar-add-item-from-menu 'save-buffers-kill-emacs "exit")
+  ;; People say it's bad to have EXIT on the tool bar, since users
+  ;; might inadvertently click that button.
+  ;;(tool-bar-add-item-from-menu 'save-buffers-kill-emacs "exit")
   (tool-bar-add-item-from-menu 'find-file "new")
   (tool-bar-add-item-from-menu 'dired "open")
   (tool-bar-add-item-from-menu 'kill-this-buffer "close")