diff --git a/ChangeLog b/ChangeLog
index c3419ff1..764e6f0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-26  Enrico Troeger  <enrico.troeger@uvena.de>
+
+ * src/utils.c, src/dialogs.c: set the Open File dialog directory to
+                               the same directory as the current file
+                               (thanks to Nick Treleaven for this patch)
+ * src/sci_cb.h: fixed a bug with auto indention and CR/LF line endings
+                 (thanks to Tamim for reporting)
+
+
 2006-01-21  Enrico Troeger  <enrico.troeger@uvena.de>
 
  * tagmanager/tex.c, src/treeviews.c: added tag support for "\begin",
diff --git a/TODO b/TODO
index c89b0ef2..82f0e935 100644
--- a/TODO
+++ b/TODO
@@ -3,7 +3,7 @@ TODO List:
 ( features included in () have lower priority)
 
 
-	Geany 0.5 or later:
+	Geany 0.6 or later:
 
 	o filetype SQL
 	o filetype (O)Caml