diff --git a/AUTHORS b/AUTHORS
index 8d4452e91d..2850546be9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,13 +2,16 @@ Developers:
 -----------
 
 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
-Colomban Wendling <lists(dot)ban(at)herbesfolles(dot)org>
+Colomban Wendling <ban(at)herbesfolles(dot)org>
 Enrico Troeger <enrico(dot)troeger(at)uvena(dot)de>
-Matthew Brush <mbrush@codebrainz.ca>
+Matthew Brush <mbrush(at)codebrainz(dot)ca>
 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
 
 Regular Contributors:
 ---------------------
 
-Lex Trotman <elextr<at>gmail<dot>com>
+Lex Trotman <elextr(at)gmail(dot)com>
 Eugene Arshinov <earshinov(at)gmail(dot)com>
+Jiří Techet <techet(at)gmail(dot)com>
+Thomas Martitz <kugel(at)rockbox(dot)org>
+Dimitar Zhekov <dimitar(dot)zhekov(at)gmail(dot)com>
diff --git a/COMMITTERS b/COMMITTERS
deleted file mode 100644
index a13ee2b058..0000000000
--- a/COMMITTERS
+++ /dev/null
@@ -1,11 +0,0 @@
-Developer           SF Username     Role/Position
-----------------------------------------------------------------------
-Enrico Tröger       eht16           Maintainer
-Nick Treleaven      ntrel           Maintainer
-Frank Lanitz        frlan           Translation Maintainer (I18N/L10N)
-Colomban Wendling   colombanw       Developer
-Lex Trotman         elextr          Developer
-Dominic Hopf        dmaphy          Developer
-Eugene Arshinov     statc           Developer
-Peter Scholtens     peterscholtens  Translator (I18N/L10N)
-Clytie Siddall      clytie          Translator (I18N/L10N)
diff --git a/Makefile.am b/Makefile.am
index 04e4a87e93..dccb85efe2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +50,6 @@ if MINGW
 	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(prefix)/Readme.txt
 	$(INSTALL_DATA) $(srcdir)/NEWS $(DESTDIR)$(prefix)/News.txt
 	$(INSTALL_DATA) $(srcdir)/THANKS $(DESTDIR)$(prefix)/Thanks.txt
-	$(INSTALL_DATA) $(srcdir)/TODO $(DESTDIR)$(prefix)/Todo.txt
 endif
 
 dist-hook:
diff --git a/README.Packagers b/README.Packagers
index 39a59c66fd..021f558778 100644
--- a/README.Packagers
+++ b/README.Packagers
@@ -84,10 +84,11 @@ list to stay informed about major changes and of course, new releases.
 
 
 
---
-2008-2012 by Enrico Tröger, Nick Treleaven, Colomban Wendling, Matthew Brush and Frank Lanitz
-enrico(dot)troeger(at)uvena(dot)de
-nick(dot)treleaven(at)btinternet(dot)com
-lists(dot)ban(at)herbesfolles(dot)org
-mbrush(at)codebrainz(dot)ca
-frank(at)frank(dot)uvena(dot)de
+----
+
+| 2008-2012 by Enrico Tröger, Nick Treleaven, Colomban Wendling, Matthew Brush and Frank Lanitz
+| enrico(dot)troeger(at)uvena(dot)de
+| nick(dot)treleaven(at)btinternet(dot)com
+| ban(at)herbesfolles(dot)org
+| mbrush(at)codebrainz(dot)ca
+| frank(at)frank(dot)uvena(dot)de
diff --git a/TODO b/TODO
deleted file mode 100644
index 11403a04a3..0000000000
--- a/TODO
+++ /dev/null
@@ -1,45 +0,0 @@
-TODO List:
-----------
-Note: features included in brackets have lower priority.
-
-	Fix bugs:
-	o tagmanager fails on UTF-16/32
-
-
-	Next version or later:
-	o better file template {filename} wildcard replacement +{BASENAME}
-	o improve line breaking mode
-	o print text size/zoom option
-	o documentation: list and explain filetype modes
-	o common default highlighting styles configurable for all
-	  programming languages (done for C-like filetypes using
-	  filetypes.common named styles)
-	o asynchronous build commands on Windows
-	o (filetype-independent run command in build dialog & keybinding)
-	o (better custom filetype support)
-	o (custom template insertion - so user can add licenses, etc)
-	o (selectable menu of arguments to use for Make, from Make Custom)
-	o (DBUS)
-	o (sci macro support - as a plugin?)
-	o (tango-like icons for the symbol list)
-	o (per-workspace instances with socket support - see
-	   workspace-sockets branch)
-
-
-	Someday:
-	o stable plugin ABI? (Split up geany_data, prefs, GeanyKeyCommand
-	  enum into groups)
-	o review documentation
-
-
-Wishlist
---------
-Note: these items might not get worked on.
-
-	o (calltip support for more non-C-like languages that use
-	   function_name(arguments) syntax - see python.c:parseArglist())
-	o (better tags support for popular languages? - this is a moving
-	   target...)
-	o (support for adding syntax highlighting dynamically?)
-	o Some kind of support for CTags tags files
-	o Python plugin interface (different concept from Lua scripting)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index de5caaf0dd..e0b81ecc86 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -32,8 +32,7 @@ doc_DATA = \
 	$(top_srcdir)/COPYING \
 	$(top_srcdir)/NEWS \
 	$(top_srcdir)/README \
-	$(top_srcdir)/THANKS \
-	$(top_srcdir)/TODO
+	$(top_srcdir)/THANKS
 
 DOCDIR = $(DESTDIR)$(docdir)
 
diff --git a/src/about.c b/src/about.c
index 9e7b02b46b..16c0e1e91b 100644
--- a/src/about.c
+++ b/src/about.c
@@ -289,7 +289,7 @@ static GtkWidget *create_dialog(void)
 	g_snprintf(buffer, sizeof(buffer), "Colomban Wendling - %s", _("maintainer"));
 	ROW(buffer, row, 0, 0, 0, 1);
 	row++;
-	ROW("&lt;lists.ban@herbesfolles.org&gt;", row, 0, 0, 0, 1);
+	ROW("&lt;ban@herbesfolles.org&gt;", row, 0, 0, 0, 1);
 	row++;
 	ROW("", row, 0, 0, 0, 0);
 	row++;