diff --git a/AUTHORS b/AUTHORS
index 2f7b69c4..659ca289 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,4 +14,5 @@ Patches:
   * Hannes Rist (:set titlestring support)
   * Marco Candrian (shift-insert patch)
   * Nikolai Weibull ($VIMPERATOR_HOME)
+  * Joseph Xu (supporting multiple top level windows better)
 </pre>
diff --git a/Donators b/Donators
index cc072a07..556f8736 100644
--- a/Donators
+++ b/Donators
@@ -1,22 +1,26 @@
 <pre>
 <b>Note:</b> If you don't wish to appear on this list when making a donation, please tell me.
 
-* Andrew Pantyukhin
-* Ben Klemens
-* Sjoerd Siebinga
-* Cillian de Roiste
-* Miron Tewfik
+2007 (most recent donators first):
+
+* Ivo-Jose Jimenez-Ramos
 * Robert Heckel
-* Stefan Krauth
-* Giuseppe Guida
-* Richard Dooling
-* Nigel McNie
-* Paulo Tanimoto
-* Nathan Saper
-* Albert Menkveld
-* Ian Taylor
-* Thomas Svensen
 * Ramana Kumar
+* Thomas Svensen
+* Ian Taylor
+* Albert Menkveld
+* Nathan Saper
+* Paulo Tanimoto
+* Nigel McNie
+* Richard Dooling
+* Giuseppe Guida
+* Stefan Krauth
+* Robert Heckel
+* Miron Tewfik
+* Cillian de Roiste
+* Sjoerd Siebinga
+* Ben Klemens
+* Andrew Pantyukhin
 
 I want to say a big <b>THANK YOU</b> for all people which supported this project in this way.
 </pre>