diff --git a/ChangeLog b/ChangeLog
index 67a930158..a952924f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-16 Quentin Mathe <quentin.mathe@gmail.com>
+
+	* Source/Functions.m:
+	* Source/NSApplication.m (-finishLaunching):
+	Moved the main Nib file loading from -finishLaunching to 
+	NSApplicationMain() to match Cocoa behavior/documentation.
+	This makes easier to implement a custom AppKit main that works with both 
+	Cocoa and GNUstep.
+
 2010-05-15  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/GSNibLoading.m (-nibInstantiate): Fix bug where a window