diff --git a/ChangeLog b/ChangeLog
index d8f25a3fb..cd5fbcf57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-09  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/NSTableHeaderCell.m (-initTextCell:): Don't wrap text in
+	table view headers by default. This partially fixes #30020.
+
 2011-03-08  Eric Wasylishen <ewasylishen@gmail.com>
 
 	* Source/NSLayoutManager.m: Implement temporary attributes
@@ -279,7 +284,7 @@
 	* Source/NSWindow.m (-setContentView:): Revert Wolfgangs change
 	and add a different solution as explained in his mail.
 
-2011-02-14  Wolfgang Lux  <wolfgang.lux@gmail.com>>
+2011-02-14  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/NSApplication.m (-_initDefaults):
 	* Source/NSWindow.m (-_initDefaults):
diff --git a/Source/NSTableHeaderCell.m b/Source/NSTableHeaderCell.m
index e904c94fe..ad16cbf56 100644
--- a/Source/NSTableHeaderCell.m
+++ b/Source/NSTableHeaderCell.m
@@ -44,6 +44,7 @@
   [self setBackgroundColor: [NSColor controlShadowColor]];
   [self setDrawsBackground: YES];
   [self setFont: [NSFont titleBarFontOfSize: 0]];
+  [self setWraps: NO];
   // This is not exactly true 
   _cell.is_bezeled = YES;
   _cell.is_bordered = NO;