diff --git a/legacy/ecore/doc/ecore.dox.in b/legacy/ecore/doc/ecore.dox.in
index 07e0b15558..542b2a980f 100644
--- a/legacy/ecore/doc/ecore.dox.in
+++ b/legacy/ecore/doc/ecore.dox.in
@@ -11,43 +11,45 @@ These routines are used for Ecore Library interaction
 @image html  e.png
 
 @version @PACKAGE_VERSION@
-@author Carsten Haitzler <raster\@rasterman.com>
-@author Tom Gilbert <tom\@linuxbrit.co.uk>
-@author Burra <burra\@colorado.edu>
-@author Chris Ross <chris\@darkrock.co.uk>
-@author Term <term\@twistedpath.org>
-@author Tilman Sauerbeck <tilman\@code-monkey.de>
-@author Ibukun Olumuyiwa <ibukun\@computer.org>
-@author Yuri <da2001\@hotmail.ru>
-@author Nicholas Curran <quasar\@bigblue.net.au>
-@author Howell Tam <pigeon\@pigeond.net>
-@author Nathan Ingersoll <rbdpngn\@users.sourceforge.net>
-@author Andrew Elcock <andy\@elcock.org>
-@author Kim Woelders <kim\@woelders.dk>
-@author Sebastian Dransfeld <sebastid\@tango.flipp.net>
-@author Simon Poole <simon.armlinux\@themalago.net>
-@author Jorge Luis Zapata Muga <jorgeluis.zapata\@gmail.com>
-@author dan sinclair <zero\@everburning.com>
-@author Michael 'Mickey' Lauer <mickey\@tm.informatik.uni-frankfurt.de>
-@author David 'onefang' Seikel <onefang\@gmail.com>
-@author Hisham 'CodeWarrior' Mardam Bey <hisham\@hisham.cc>
-@author Brian 'rephorm' Mattern <rephorm\@rephorm.com>
-@author Tim Horton <hortont424\@gmail.com>
-@author Arnaud de Turckheim 'quarium' <quarium\@gmail.com>
-@author Matt Barclay <mbarclay\@gmail.com>
-@author Peter Wehrfritz <peter.wehrfritz\@web.de>
-@author Albin "Lutin" Tonnerre <albin.tonnerre\@gmail.com>
-@author Vincent Torri <vincent.torri\@gmail.com>
-@author Lars Munch <lars\@segv.dk>
-@author Andre Dieb <andre.dieb\@gmail.com>
-@author Mathieu Taillefumier <mathieu.taillefumier\@free.fr>
-@author Rui Miguel Silva Seabra <rms\@1407.org>
+@author Carsten Haitzler <raster@@rasterman.com>
+@author Tom Gilbert <tom@@linuxbrit.co.uk>
+@author Burra <burra@@colorado.edu>
+@author Chris Ross <chris@@darkrock.co.uk>
+@author Term <term@@twistedpath.org>
+@author Tilman Sauerbeck <tilman@@code-monkey.de>
+@author Ibukun Olumuyiwa <ibukun@@computer.org>
+@author Yuri <da2001@@hotmail.ru>
+@author Nicholas Curran <quasar@@bigblue.net.au>
+@author Howell Tam <pigeon@@pigeond.net>
+@author Nathan Ingersoll <rbdpngn@@users.sourceforge.net>
+@author Andrew Elcock <andy@@elcock.org>
+@author Kim Woelders <kim@@woelders.dk>
+@author Sebastian Dransfeld <sebastid@@tango.flipp.net>
+@author Simon Poole <simon.armlinux@@themalago.net>
+@author Jorge Luis Zapata Muga <jorgeluis.zapata@@gmail.com>
+@author dan sinclair <zero@@everburning.com>
+@author Michael 'Mickey' Lauer <mickey@@tm.informatik.uni-frankfurt.de>
+@author David 'onefang' Seikel <onefang@@gmail.com>
+@author Hisham 'CodeWarrior' Mardam Bey <hisham@@hisham.cc>
+@author Brian 'rephorm' Mattern <rephorm@@rephorm.com>
+@author Tim Horton <hortont424@@gmail.com>
+@author Arnaud de Turckheim 'quarium' <quarium@@gmail.com>
+@author Matt Barclay <mbarclay@@gmail.com>
+@author Peter Wehrfritz <peter.wehrfritz@@web.de>
+@author Albin "Lutin" Tonnerre <albin.tonnerre@@gmail.com>
+@author Vincent Torri <vincent.torri@@gmail.com>
+@author Lars Munch <lars@@segv.dk>
+@author Andre Dieb <andre.dieb@@gmail.com>
+@author Mathieu Taillefumier <mathieu.taillefumier@@free.fr>
+@author Rui Miguel Silva Seabra <rms@@1407.org>
 @author Saumsung Electronics
 @author Samsung SAIT
-@author Nicolas Aguirre <aguirre.nicolas\@gmail.com>
-@author Brett Nash <nash\@nash.id.au>
-@author Mike Blumenkrantz <mike\@zentific.com>
-@date 2000-2010
+@author Nicolas Aguirre <aguirre.nicolas@@gmail.com>
+@author Brett Nash <nash@@nash.id.au>
+@author Mike Blumenkrantz <mike@@zentific.com>
+@author Leif Middelschulte <leif.middelschulte@@gmail.com>
+@author Mike McCormack <mj.mccormack@@samsung.com>
+@date 2000-2011
 
 @section intro Introduction
 
diff --git a/legacy/edje/doc/edje.dox.in b/legacy/edje/doc/edje.dox.in
index fecec266fc..739a5130e8 100644
--- a/legacy/edje/doc/edje.dox.in
+++ b/legacy/edje/doc/edje.dox.in
@@ -10,8 +10,23 @@ These routines are used for Edje.
 @mainpage Edje Library Documentation
 @image html  e.png
 @version @PACKAGE_VERSION@
-@author Carsten Haitzler <raster\@rasterman.com>
-@date 2003-2010
+@author Carsten Haitzler <raster@@rasterman.com>
+@author Tilman Sauerbeck (tilman at code-monkey de)
+@author ZigsMcKenzie <zigsmckenzie@@gmail.com>
+@author Cedric BAIL <cedric.bail@@free.fr>
+@author Brian Mattern <rephorm@@rephorm.com>
+@author Mathieu Taillefumier <mathieu.taillefumier@@free.fr>
+@author Tristan <blunderer@@gmail.com>
+@author Gustavo Lima Chaves <glima@@profusion.mobi>
+@author Bruno Dilly <bdilly@@profusion.mobi>
+@author Fabiano Fidêncio <fidencio@@profusion.mobi>
+@author Jihoon Kim <jihoon48.kim@@samsung.com>
+@author Tiago Falcão <tiago@@profusion.mobi>
+@author Davide Andreoli <dave@@gurumeditation.it>
+@author Sebastian Dransfeld <sd@@tango.flipp.net>
+@author Tom Hacohen <tom@@stosb.com>
+@author Aharon Hillel <a.hillel@@partner.samsung.com>
+@date 2003-2011
 
 
 
diff --git a/legacy/eet/doc/eet.dox.in b/legacy/eet/doc/eet.dox.in
index 14c0ed4464..c44970760d 100644
--- a/legacy/eet/doc/eet.dox.in
+++ b/legacy/eet/doc/eet.dox.in
@@ -24,8 +24,7 @@ These routines are used for Eet Library interaction
 @author Mathieu Taillefumier <mathieu.taillefumier@@free.fr>
 @author Albin "Lutin" Tonnerre <albin.tonnerre@@gmail.com>
 @author Adam Simpkins <adam@@adamsimpkins.net>
-
-@date 2000-2010
+@date 2000-2011
 
 @section toc Table of Contents
 
diff --git a/legacy/eeze/doc/eeze.dox.in b/legacy/eeze/doc/eeze.dox.in
index bab71d5b0a..b6e0e4f7bd 100644
--- a/legacy/eeze/doc/eeze.dox.in
+++ b/legacy/eeze/doc/eeze.dox.in
@@ -7,8 +7,8 @@
 @mainpage Eeze
 @image html  eeze.png
 @version @PACKAGE_VERSION@
-@author Mike Blumenkrantz (zmike/discomfitor) <mike@zentific.com>
-@date 2010
+@author Mike Blumenkrantz (zmike/discomfitor) <mike@@zentific.com>
+@date 2010-2011
 
 @section intro What is Eeze?
 
diff --git a/legacy/eio/doc/eio.dox.in b/legacy/eio/doc/eio.dox.in
index 85dacabb40..b1e897c717 100644
--- a/legacy/eio/doc/eio.dox.in
+++ b/legacy/eio/doc/eio.dox.in
@@ -22,11 +22,11 @@
 
 /**
  * @mainpage Eio
- * @author Cedric Bail <cedric.bail@free.fr>
+ * @author Cedric Bail <cedric.bail@@free.fr>
+ * @author Stephen "okra" Houston <unixtitan@@gmail.com>
+ * @author Gustavo Sverzut Barbieri <barbieri@@gmail.com>
  * @author Vincent "caro" Torri  <vtorri at univ-evry dot fr>
- * @author Stephen "okra" Houston <unixtitan@gmail.com>
- * @author Gustavo Sverzut Barbieri <barbieri@gmail.com>
- * @date 2010
+ * @date 2010-2011
  *
  * @section eio_intro_sec Introduction
  * @version @PACKAGE_VERSION@
diff --git a/legacy/evas/doc/evas.dox.in b/legacy/evas/doc/evas.dox.in
index c9c3334111..4b0fea1176 100644
--- a/legacy/evas/doc/evas.dox.in
+++ b/legacy/evas/doc/evas.dox.in
@@ -25,8 +25,9 @@
 @author Mathieu Taillefumier <mathieu.taillefumier@@free.fr>
 @author Iván Briano <ivan@@profusion.mobi>
 @author Gustavo Lima Chaves <glima@@profusion.mobi>
-
-@date 2000-2010
+@author Saumsung Electronics <tbd>
+@author Samsung SAIT <tbd>
+@date 2000-2011
 
 @section toc Table of Contents