diff --git a/ChangeLog b/ChangeLog
index 1435e0a6..1af66ca3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2006-03-17  Enrico Troeger  <enrico.troeger@uvena.de>
+
+ * bugfix: src/sci_cb.c: typing } on lines longer than 256 chars caused
+                         a crash (segfault)
+
+
+2006-03-15  Enrico Troeger  <enrico.troeger@uvena.de>
+
+ * src/geany.h, src/main.c, src/keyfile.c:
+   added GEANY_WINDOW_MINIMAL_WIDTH, GEANY_WINDOW_MINIMAL_HEIGHT,
+   GEANY_WINDOW_DEFAULT_WIDTH, GEANY_WINDOW_DEFAULT_HEIGHT to make it
+   easier to changed these defaults
+
+
+2006-03-14  Enrico Troeger  <enrico.troeger@uvena.de>
+
+ * src/callbacks.c: added check for existing documentation, otherwise
+                    try online documentation
+
+
+2006-03-11  Enrico Troeger  <enrico.troeger@uvena.de>
+
+ * geany.glade, src/interface.c, src/main.c:
+   set minimal size to 620x440, default size to 900x600, added command
+   line option -m or --no-msgwin to disable message window at startup
+ * doc/geany.docbook: added description for -m option
+
+
 2006-03-10  Enrico Troeger  <enrico.troeger@uvena.de>
 
  * src/callbacks.c: applied patch from Nick Treleaven to allow
@@ -11,6 +39,9 @@
    applied patch from Nick Treleaven which improved inserting of
    current selection in the find and replace dialogs
  * src/filetypes.c: added new extensions for filetype Pascal
+ * src/data/filetypes.conf, src/highlighting.c:
+   added "key" and edited colours for changed lexer
+ * scintilla/*: updated Scintilla to version 1.68
 
 
 2006-03-09  Enrico Troeger  <enrico.troeger@uvena.de>