diff --git a/ChangeLog b/ChangeLog
index 9ba4ead1cd..2d98abb456 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkrc.c (_gtk_rc_init): Fix clipping of accelerator
+	underlines by giving labels a small draw-border.
+
 2006-12-06  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtkcellrendererprogress.c (gtk_cell_renderer_progress_render):
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 087e8416db..96c68cbce1 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -881,15 +881,22 @@ _gtk_rc_init (void)
 		       "  text[PRELIGHT] = \"#ffffff\"\n"
 		       "}\n"
 		       "\n"
+                       /* Make transparent tray icons work */
 		       "style \"gtk-default-tray-icon-style\" {\n"
 		       "  bg_pixmap[NORMAL] = \"<parent>\"\n"
 		       "}\n"
 		       "\n"
+                       /* Work around clipping of accelerator underlines */
+                       "style \"gtk-default-label-style\" {\n"
+                       "  GtkWidget::draw-border = {0,0,0,1}\n"
+                       "}\n"
+                       "\n"    
 		       "class \"GtkProgressBar\" style : gtk \"gtk-default-progress-bar-style\"\n"
 		       "class \"GtkTrayIcon\" style : gtk \"gtk-default-tray-icon-style\"\n"
 		       "widget \"gtk-tooltips*\" style : gtk \"gtk-default-tooltips-style\"\n"
 		       "widget_class \"*<GtkMenuItem>*\" style : gtk \"gtk-default-menu-item-style\"\n"
 		       "widget_class \"*<GtkMenuBar>*<GtkMenuItem>\" style : gtk \"gtk-default-menu-bar-item-style\"\n"
+                       "class \"GtkLabel\" style : gtk \"gtk-default-label-style\"\n"
       );
 }