diff --git a/ChangeLog b/ChangeLog
index 63fecb35..2ad9d517 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2006-02-25  Enrico Troeger  <enrico.troeger@uvena.de>
+
+ * src/keyfile.c: fixed memory leak, load filetype extensions from a
+                  file in the configuration directory, the filetype of
+                  a document is now also stored at loading and saving
+                  session files
+ * src/filetypes.c: removed unneeded constant GEANY_MAX_PATTERNS
+
+
+2006-02-24  Enrico Troeger  <enrico.troeger@uvena.de>
+
+ * src/utils.c, src/callbacks.c, src/dialogs.c, src/main.c:
+   made "make" build menu items sensitive for C header files
+ * bugfix: src/vte.c: hopefully fixed a crash when closing the
+                      preferences dialog and message window was hidden
+                      and shown before
+
+
 2006-02-21  Enrico Troeger  <enrico.troeger@uvena.de>
 
  * src/utils.c: added utils_make_human_readable_str()
diff --git a/TODO b/TODO
index dfae581e..f66907d6 100644
--- a/TODO
+++ b/TODO
@@ -5,9 +5,9 @@ TODO List:
 
 	Geany 0.6 or later:
 
-	O vte.c:265
+	o test filetype extension loading
 	o create filetype specific menus, read templates from filetypes.*,
-	  use XML instead og key-value-format
+	  use XML instead of key-value-format
 	o template rework
 	o improve toolbar tooltips translation
 	o fix a freeze at switching between filetypes with files in
@@ -15,11 +15,8 @@ TODO List:
 	o fix: "attempt to put segment in horiz list twice" warning
 	o encoding-bug in utils_convert_to_utf8()
 	o documentation: list and explain filetype modes
-	o src/interface.c: reorder the 'document' menu entry, differ between
-	  document related and general settings, new submenu: View->Editor
 	o make keyboard shortcuts user-definable
 	o inverting highlighting by selection
-	o put default filetype extensions in the config file, read them in a GList
 	o src/sci_cb.c: improve auto completion(include local tags)
 	o extend use of doc_list[].is_valid
 	o (PHP syntax check)
@@ -29,4 +26,3 @@ TODO List:
 	o (project management)
 	o (folding)
 	o (folder tree in the sidebar)
-	o (vim-like settings stored in files as comment)