diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d43a7b52765..bf83c18cd8b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2001-01-30  Gerd Moellmann  <gerd@gnu.org>
 
+	* frame.el (frame-notice-user-settings): Do the tool-bar
+	stuff only for graphical displays.  Fix a braino.
+	
 	* frame.el (frame-initialize): Create initial frame visible.
 	(frame-notice-user-settings): When tool-bar has been switched off,
 	correct the frame size and sync too-bar-mode.
diff --git a/src/ChangeLog b/src/ChangeLog
index 706ff7979b1..54dbe552901 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2001-01-30  Gerd Moellmann  <gerd@gnu.org>
+
+	* xdisp.c (build_desired_tool_bar_string, syms_of_xdisp): Use
+	DEFAULT_TOOL_BAR_BUTTON_MARGIN and DEFAULT_TOOL_BAR_BUTTON_RELIEF.
+
+	* dispextern.h (Vtool_bar_button_margin:): Declare extern.
+	(DEFAULT_TOOL_BAR_BUTTON_MARGIN, DEFAULT_TOOL_BAR_BUTTON_RELIEF) 
+	(DEFAULT_TOOL_BAR_IMAGE_HEIGHT): New defines.
+
+	* xfns.c (Fx_create_frame): Add the tool bar height to the frame
+	height.
+
 2001-01-30  Dave Love  <fx@gnu.org>
 
 	* bytecode.c (Fbyte_code) <Bgeq>: Add BEFORE_POTENTIAL_GC and