diff --git a/ChangeLog b/ChangeLog
index 9f08b7fab..188bd1f6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-25  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/NSFontManager.m (-orderFrontFontPanel:): Add method to
+	NSApplication in a new category to make the standard font panel
+	toolbar item work.
+
 2010-09-24 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSButton.m (-keyDown:): Remove unused code found by
diff --git a/Source/NSFontManager.m b/Source/NSFontManager.m
index e173225a5..75154d19b 100644
--- a/Source/NSFontManager.m
+++ b/Source/NSFontManager.m
@@ -1192,3 +1192,12 @@ static Class         fontPanelClass = Nil;
 }
 
 @end
+
+@implementation NSApplication(NSFontPanel)
+
+- (void) orderFrontFontPanel: (id)sender
+{
+  [[NSFontManager sharedFontManager] orderFrontFontPanel: sender];
+}
+
+@end