diff --git a/ChangeLog b/ChangeLog
index c074cfa1c..e33a4e9cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2005-11-27  Enrico Troeger  <enrico.troeger@uvena.de>
+
+ * src/vte.c/h: newly created: contains functions for the terminal
+                emulator widget, which is loaded if libvte.so.4 is
+                available
+ * configure.in: added option --[en|dis]able-vte to disable vte support
+
+
+2005-11-25  Enrico Troeger  <enrico.troeger@uvena.de>
+
+ * scintilla/LexOthers.cxx: edited the properties lexer to colourize
+                            key=value pairs a bit nicer
+ * tagmanager/parsers.h, tagmanager/conf.c, tagmanger/Makefile.am:
+   added conf.c(built from make.c), to create tags for config files
+ * src/utils.c, src/callbacks.c: rewrite untitled.extension after
+                                 "Save As" in the file header
+
+
+2005-11-24  Enrico Troeger  <enrico.troeger@uvena.de>
+
+ * src/keyfile.c, src/interface.c, src/prefs.c, src/msgwindow.c:
+   added new option "Switch to status message list"
+ * src/keyfile.c: store the position of vpaned1 too(sizer between
+                  editor window and the status message list)
+ *src/highlighting.c, src/filetypes.c: added new filetype "Conf"
+
+
 2005-11-22  Enrico Troeger  <enrico.troeger@uvena.de>
 
  * bugfix: src/sci_cb.c: added missing / to the closing tr-tag in HTML
diff --git a/TODO b/TODO
index c6f655fd9..58099df95 100644
--- a/TODO
+++ b/TODO
@@ -19,11 +19,12 @@ TODO List:
 	o latex build menu
 	o colourize the tags in the tag list widget to show if it's a
 	  function, macro or whatever
-	o rewrite untitled.extension after "Save As" in the file header
 	o fix { and } problems at some "special" lines where indentation
 	  get broken
-	o command line option -e
-	o bug? start without coloring files
+	o command line option -e (editor mode)
+	o fix bug in highlighting.c at style_init_c
+	o vte.c: clipboard support, add configure option --disable-vte
+	o BSD compatibility
 	o (indent wrapped lines, but how?)
 	o (project management)
 	o (folding)