diff --git a/ChangeLog b/ChangeLog
index fee15cfe38..f372760d62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-01-17  Nat Friedman  <nat@nat.org>
+
+	* gtk/gtkscrolledwindow.c (DEFAULT_SCROLLBAR_SPACING): New macro.
+  	Changed the spacing from 5 to 3.
+
+	* gtk/gtkmenubar.c (BORDER_SPACING): Changed the extra spacing on
+ 	the menubar from 2 to 0.
+
 Sun Jan 17 11:51:17 1999  Owen Taylor  <otaylor@gtk.org>
 
 	* gtk/gtktext.c (gtk_text_move_cursor): Fix typo
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index fee15cfe38..f372760d62 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+1999-01-17  Nat Friedman  <nat@nat.org>
+
+	* gtk/gtkscrolledwindow.c (DEFAULT_SCROLLBAR_SPACING): New macro.
+  	Changed the spacing from 5 to 3.
+
+	* gtk/gtkmenubar.c (BORDER_SPACING): Changed the extra spacing on
+ 	the menubar from 2 to 0.
+
 Sun Jan 17 11:51:17 1999  Owen Taylor  <otaylor@gtk.org>
 
 	* gtk/gtktext.c (gtk_text_move_cursor): Fix typo
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fee15cfe38..f372760d62 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+1999-01-17  Nat Friedman  <nat@nat.org>
+
+	* gtk/gtkscrolledwindow.c (DEFAULT_SCROLLBAR_SPACING): New macro.
+  	Changed the spacing from 5 to 3.
+
+	* gtk/gtkmenubar.c (BORDER_SPACING): Changed the extra spacing on
+ 	the menubar from 2 to 0.
+
 Sun Jan 17 11:51:17 1999  Owen Taylor  <otaylor@gtk.org>
 
 	* gtk/gtktext.c (gtk_text_move_cursor): Fix typo
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index fee15cfe38..f372760d62 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+1999-01-17  Nat Friedman  <nat@nat.org>
+
+	* gtk/gtkscrolledwindow.c (DEFAULT_SCROLLBAR_SPACING): New macro.
+  	Changed the spacing from 5 to 3.
+
+	* gtk/gtkmenubar.c (BORDER_SPACING): Changed the extra spacing on
+ 	the menubar from 2 to 0.
+
 Sun Jan 17 11:51:17 1999  Owen Taylor  <otaylor@gtk.org>
 
 	* gtk/gtktext.c (gtk_text_move_cursor): Fix typo
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fee15cfe38..f372760d62 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+1999-01-17  Nat Friedman  <nat@nat.org>
+
+	* gtk/gtkscrolledwindow.c (DEFAULT_SCROLLBAR_SPACING): New macro.
+  	Changed the spacing from 5 to 3.
+
+	* gtk/gtkmenubar.c (BORDER_SPACING): Changed the extra spacing on
+ 	the menubar from 2 to 0.
+
 Sun Jan 17 11:51:17 1999  Owen Taylor  <otaylor@gtk.org>
 
 	* gtk/gtktext.c (gtk_text_move_cursor): Fix typo
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fee15cfe38..f372760d62 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+1999-01-17  Nat Friedman  <nat@nat.org>
+
+	* gtk/gtkscrolledwindow.c (DEFAULT_SCROLLBAR_SPACING): New macro.
+  	Changed the spacing from 5 to 3.
+
+	* gtk/gtkmenubar.c (BORDER_SPACING): Changed the extra spacing on
+ 	the menubar from 2 to 0.
+
 Sun Jan 17 11:51:17 1999  Owen Taylor  <otaylor@gtk.org>
 
 	* gtk/gtktext.c (gtk_text_move_cursor): Fix typo
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fee15cfe38..f372760d62 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+1999-01-17  Nat Friedman  <nat@nat.org>
+
+	* gtk/gtkscrolledwindow.c (DEFAULT_SCROLLBAR_SPACING): New macro.
+  	Changed the spacing from 5 to 3.
+
+	* gtk/gtkmenubar.c (BORDER_SPACING): Changed the extra spacing on
+ 	the menubar from 2 to 0.
+
 Sun Jan 17 11:51:17 1999  Owen Taylor  <otaylor@gtk.org>
 
 	* gtk/gtktext.c (gtk_text_move_cursor): Fix typo
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index bf75e395f4..d01fe2c2c5 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -28,7 +28,7 @@ enum {
 };
 
 
-#define BORDER_SPACING  2
+#define BORDER_SPACING  0
 #define CHILD_SPACING   3
 
 
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index d994449a46..b6f41d5dd1 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -57,6 +57,8 @@
 
 #define SCROLLBAR_SPACING(w) (GTK_SCROLLED_WINDOW_CLASS (GTK_OBJECT (w)->klass)->scrollbar_spacing)
 
+#define DEFAULT_SCROLLBAR_SPACING  3
+
 enum {
   ARG_0,
   ARG_HADJUSTMENT,
@@ -175,7 +177,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
   container_class->remove = gtk_scrolled_window_remove;
   container_class->forall = gtk_scrolled_window_forall;
 
-  class->scrollbar_spacing = 5;
+  class->scrollbar_spacing = DEFAULT_SCROLLBAR_SPACING;
 }
 
 static void