diff --git a/appendices/timezones.xml b/appendices/timezones.xml
index 15785467c8..535b08ec29 100644
--- a/appendices/timezones.xml
+++ b/appendices/timezones.xml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- AUTO GENERATED, DO NOT MODIFY BY HAND -->
 
 <appendix id="timezones">
  <title>List of Supported Timezones</title>
  <para>
+  Here you'll find the complete list of timezones supported by PHP, which are
+  meant to be used with e.g. <function>date_default_timezone_set</function>.
  </para>
+ <note>
+  <simpara>
+   The latest version of the timezone database can be installed via PECL's
+   <ulink url="&url.pecl.package.get;timezonedb">timezonedb</ulink>.
+   For Windows users, a pre-compiled DLL can be downloaded from the PECL4Win
+   site: <ulink url="&url.pecl.timezonedb.dll;">php_timezonedb.dll</ulink>.
+  </simpara>
+ </note>
 
  <sect1 id="timezones.africa">
   <title>List of timezones in the group Africa</title>
@@ -90,14 +100,6 @@
     </tbody>
    </tgroup>
   </table>
-  <note>
-   <simpara>
-    The latest version of the timezone database can be installed via PECL's
-    <ulink url="&url.pecl.package.get;timezonedb">timezonedb</ulink>.
-    For Windows users, a pre-compiled DLL can be downloaded from the PECL4Win
-    site: <ulink url="&url.pecl.timezonedb.dll;">php_timezonedb.dll</ulink>.
-   </simpara>
-  </note>
  </sect1>
 
  <sect1 id="timezones.america">
@@ -131,194 +133,190 @@
       <entry>America/Argentina/Ushuaia</entry>
       <entry>America/Aruba</entry>
       <entry>America/Asuncion</entry>
+      <entry>America/Atikokan</entry>
       <entry>America/Atka</entry>
-      <entry>America/Bahia</entry>
      </row>
      <row>
+      <entry>America/Bahia</entry>
       <entry>America/Barbados</entry>
       <entry>America/Belem</entry>
       <entry>America/Belize</entry>
-      <entry>America/Boa_Vista</entry>
-      <entry>America/Bogota</entry>
+      <entry>America/Blanc-Sablon</entry>
      </row>
      <row>
+      <entry>America/Boa_Vista</entry>
+      <entry>America/Bogota</entry>
       <entry>America/Boise</entry>
       <entry>America/Buenos_Aires</entry>
       <entry>America/Cambridge_Bay</entry>
-      <entry>America/Campo_Grande</entry>
-      <entry>America/Cancun</entry>
      </row>
      <row>
+      <entry>America/Campo_Grande</entry>
+      <entry>America/Cancun</entry>
       <entry>America/Caracas</entry>
       <entry>America/Catamarca</entry>
       <entry>America/Cayenne</entry>
-      <entry>America/Cayman</entry>
-      <entry>America/Chicago</entry>
      </row>
      <row>
+      <entry>America/Cayman</entry>
+      <entry>America/Chicago</entry>
       <entry>America/Chihuahua</entry>
       <entry>America/Coral_Harbour</entry>
       <entry>America/Cordoba</entry>
-      <entry>America/Costa_Rica</entry>
-      <entry>America/Cuiaba</entry>
      </row>
      <row>
+      <entry>America/Costa_Rica</entry>
+      <entry>America/Cuiaba</entry>
       <entry>America/Curacao</entry>
       <entry>America/Danmarkshavn</entry>
       <entry>America/Dawson</entry>
-      <entry>America/Dawson_Creek</entry>
-      <entry>America/Denver</entry>
      </row>
      <row>
+      <entry>America/Dawson_Creek</entry>
+      <entry>America/Denver</entry>
       <entry>America/Detroit</entry>
       <entry>America/Dominica</entry>
       <entry>America/Edmonton</entry>
-      <entry>America/Eirunepe</entry>
-      <entry>America/El_Salvador</entry>
      </row>
      <row>
+      <entry>America/Eirunepe</entry>
+      <entry>America/El_Salvador</entry>
       <entry>America/Ensenada</entry>
       <entry>America/Fort_Wayne</entry>
       <entry>America/Fortaleza</entry>
-      <entry>America/Glace_Bay</entry>
-      <entry>America/Godthab</entry>
      </row>
      <row>
+      <entry>America/Glace_Bay</entry>
+      <entry>America/Godthab</entry>
       <entry>America/Goose_Bay</entry>
       <entry>America/Grand_Turk</entry>
       <entry>America/Grenada</entry>
-      <entry>America/Guadeloupe</entry>
-      <entry>America/Guatemala</entry>
      </row>
      <row>
+      <entry>America/Guadeloupe</entry>
+      <entry>America/Guatemala</entry>
       <entry>America/Guayaquil</entry>
       <entry>America/Guyana</entry>
       <entry>America/Halifax</entry>
-      <entry>America/Havana</entry>
-      <entry>America/Hermosillo</entry>
      </row>
      <row>
+      <entry>America/Havana</entry>
+      <entry>America/Hermosillo</entry>
       <entry>America/Indiana/Indianapolis</entry>
       <entry>America/Indiana/Knox</entry>
       <entry>America/Indiana/Marengo</entry>
-      <entry>America/Indiana/Petersburg</entry>
-      <entry>America/Indiana/Vevay</entry>
      </row>
      <row>
+      <entry>America/Indiana/Petersburg</entry>
+      <entry>America/Indiana/Vevay</entry>
       <entry>America/Indiana/Vincennes</entry>
       <entry>America/Indianapolis</entry>
       <entry>America/Inuvik</entry>
-      <entry>America/Iqaluit</entry>
-      <entry>America/Jamaica</entry>
      </row>
      <row>
+      <entry>America/Iqaluit</entry>
+      <entry>America/Jamaica</entry>
       <entry>America/Jujuy</entry>
       <entry>America/Juneau</entry>
       <entry>America/Kentucky/Louisville</entry>
-      <entry>America/Kentucky/Monticello</entry>
-      <entry>America/Knox_IN</entry>
      </row>
      <row>
+      <entry>America/Kentucky/Monticello</entry>
+      <entry>America/Knox_IN</entry>
       <entry>America/La_Paz</entry>
       <entry>America/Lima</entry>
       <entry>America/Los_Angeles</entry>
-      <entry>America/Louisville</entry>
-      <entry>America/Maceio</entry>
      </row>
      <row>
+      <entry>America/Louisville</entry>
+      <entry>America/Maceio</entry>
       <entry>America/Managua</entry>
       <entry>America/Manaus</entry>
       <entry>America/Martinique</entry>
-      <entry>America/Mazatlan</entry>
-      <entry>America/Mendoza</entry>
      </row>
      <row>
+      <entry>America/Mazatlan</entry>
+      <entry>America/Mendoza</entry>
       <entry>America/Menominee</entry>
       <entry>America/Merida</entry>
       <entry>America/Mexico_City</entry>
-      <entry>America/Miquelon</entry>
-      <entry>America/Moncton</entry>
      </row>
      <row>
+      <entry>America/Miquelon</entry>
+      <entry>America/Moncton</entry>
       <entry>America/Monterrey</entry>
       <entry>America/Montevideo</entry>
       <entry>America/Montreal</entry>
-      <entry>America/Montserrat</entry>
-      <entry>America/Nassau</entry>
      </row>
      <row>
+      <entry>America/Montserrat</entry>
+      <entry>America/Nassau</entry>
       <entry>America/New_York</entry>
       <entry>America/Nipigon</entry>
       <entry>America/Nome</entry>
-      <entry>America/Noronha</entry>
-      <entry>America/North_Dakota/Center</entry>
      </row>
      <row>
+      <entry>America/Noronha</entry>
+      <entry>America/North_Dakota/Center</entry>
       <entry>America/North_Dakota/New_Salem</entry>
       <entry>America/Panama</entry>
       <entry>America/Pangnirtung</entry>
-      <entry>America/Paramaribo</entry>
-      <entry>America/Phoenix</entry>
      </row>
      <row>
+      <entry>America/Paramaribo</entry>
+      <entry>America/Phoenix</entry>
       <entry>America/Port-au-Prince</entry>
       <entry>America/Port_of_Spain</entry>
       <entry>America/Porto_Acre</entry>
-      <entry>America/Porto_Velho</entry>
-      <entry>America/Puerto_Rico</entry>
      </row>
      <row>
+      <entry>America/Porto_Velho</entry>
+      <entry>America/Puerto_Rico</entry>
       <entry>America/Rainy_River</entry>
       <entry>America/Rankin_Inlet</entry>
       <entry>America/Recife</entry>
-      <entry>America/Regina</entry>
-      <entry>America/Rio_Branco</entry>
      </row>
      <row>
+      <entry>America/Regina</entry>
+      <entry>America/Rio_Branco</entry>
       <entry>America/Rosario</entry>
       <entry>America/Santiago</entry>
       <entry>America/Santo_Domingo</entry>
-      <entry>America/Sao_Paulo</entry>
-      <entry>America/Scoresbysund</entry>
      </row>
      <row>
+      <entry>America/Sao_Paulo</entry>
+      <entry>America/Scoresbysund</entry>
       <entry>America/Shiprock</entry>
       <entry>America/St_Johns</entry>
       <entry>America/St_Kitts</entry>
-      <entry>America/St_Lucia</entry>
-      <entry>America/St_Thomas</entry>
      </row>
      <row>
+      <entry>America/St_Lucia</entry>
+      <entry>America/St_Thomas</entry>
       <entry>America/St_Vincent</entry>
       <entry>America/Swift_Current</entry>
       <entry>America/Tegucigalpa</entry>
-      <entry>America/Thule</entry>
-      <entry>America/Thunder_Bay</entry>
      </row>
      <row>
+      <entry>America/Thule</entry>
+      <entry>America/Thunder_Bay</entry>
       <entry>America/Tijuana</entry>
       <entry>America/Toronto</entry>
       <entry>America/Tortola</entry>
-      <entry>America/Vancouver</entry>
-      <entry>America/Virgin</entry>
      </row>
      <row>
+      <entry>America/Vancouver</entry>
+      <entry>America/Virgin</entry>
       <entry>America/Whitehorse</entry>
       <entry>America/Winnipeg</entry>
       <entry>America/Yakutat</entry>
+     </row>
+     <row>
       <entry>America/Yellowknife</entry>
      </row>
     </tbody>
    </tgroup>
   </table>
-  <note>
-   <simpara>
-    The latest version of the timezone database can be installed via PECL's
-    <ulink url="&url.pecl.package.get;timezonedb">timezonedb</ulink>.
-    For Windows users, a pre-compiled DLL can be downloaded from the PECL4Win
-    site: <ulink url="&url.pecl.timezonedb.dll;">php_timezonedb.dll</ulink>.
-   </simpara>
-  </note>
  </sect1>
 
  <sect1 id="timezones.antarctica">
@@ -344,14 +342,6 @@
     </tbody>
    </tgroup>
   </table>
-  <note>
-   <simpara>
-    The latest version of the timezone database can be installed via PECL's
-    <ulink url="&url.pecl.package.get;timezonedb">timezonedb</ulink>.
-    For Windows users, a pre-compiled DLL can be downloaded from the PECL4Win
-    site: <ulink url="&url.pecl.timezonedb.dll;">php_timezonedb.dll</ulink>.
-   </simpara>
-  </note>
  </sect1>
 
  <sect1 id="timezones.arctic">
@@ -366,14 +356,6 @@
     </tbody>
    </tgroup>
   </table>
-  <note>
-   <simpara>
-    The latest version of the timezone database can be installed via PECL's
-    <ulink url="&url.pecl.package.get;timezonedb">timezonedb</ulink>.
-    For Windows users, a pre-compiled DLL can be downloaded from the PECL4Win
-    site: <ulink url="&url.pecl.timezonedb.dll;">php_timezonedb.dll</ulink>.
-   </simpara>
-  </note>
  </sect1>
 
  <sect1 id="timezones.asia">
@@ -503,14 +485,6 @@
     </tbody>
    </tgroup>
   </table>
-  <note>
-   <simpara>
-    The latest version of the timezone database can be installed via PECL's
-    <ulink url="&url.pecl.package.get;timezonedb">timezonedb</ulink>.
-    For Windows users, a pre-compiled DLL can be downloaded from the PECL4Win
-    site: <ulink url="&url.pecl.timezonedb.dll;">php_timezonedb.dll</ulink>.
-   </simpara>
-  </note>
  </sect1>
 
  <sect1 id="timezones.atlantic">
@@ -539,14 +513,6 @@
     </tbody>
    </tgroup>
   </table>
-  <note>
-   <simpara>
-    The latest version of the timezone database can be installed via PECL's
-    <ulink url="&url.pecl.package.get;timezonedb">timezonedb</ulink>.
-    For Windows users, a pre-compiled DLL can be downloaded from the PECL4Win
-    site: <ulink url="&url.pecl.timezonedb.dll;">php_timezonedb.dll</ulink>.
-   </simpara>
-  </note>
  </sect1>
 
  <sect1 id="timezones.australia">
@@ -590,14 +556,6 @@
     </tbody>
    </tgroup>
   </table>
-  <note>
-   <simpara>
-    The latest version of the timezone database can be installed via PECL's
-    <ulink url="&url.pecl.package.get;timezonedb">timezonedb</ulink>.
-    For Windows users, a pre-compiled DLL can be downloaded from the PECL4Win
-    site: <ulink url="&url.pecl.timezonedb.dll;">php_timezonedb.dll</ulink>.
-   </simpara>
-  </note>
  </sect1>
 
  <sect1 id="timezones.europe">
@@ -625,73 +583,71 @@
       <entry>Europe/Copenhagen</entry>
       <entry>Europe/Dublin</entry>
       <entry>Europe/Gibraltar</entry>
-      <entry>Europe/Helsinki</entry>
+      <entry>Europe/Guernsey</entry>
      </row>
      <row>
+      <entry>Europe/Helsinki</entry>
+      <entry>Europe/Isle_of_Man</entry>
       <entry>Europe/Istanbul</entry>
+      <entry>Europe/Jersey</entry>
       <entry>Europe/Kaliningrad</entry>
+     </row>
+     <row>
       <entry>Europe/Kiev</entry>
       <entry>Europe/Lisbon</entry>
       <entry>Europe/Ljubljana</entry>
-     </row>
-     <row>
       <entry>Europe/London</entry>
       <entry>Europe/Luxembourg</entry>
+     </row>
+     <row>
       <entry>Europe/Madrid</entry>
       <entry>Europe/Malta</entry>
       <entry>Europe/Mariehamn</entry>
-     </row>
-     <row>
       <entry>Europe/Minsk</entry>
       <entry>Europe/Monaco</entry>
+     </row>
+     <row>
       <entry>Europe/Moscow</entry>
       <entry>Europe/Nicosia</entry>
       <entry>Europe/Oslo</entry>
-     </row>
-     <row>
       <entry>Europe/Paris</entry>
       <entry>Europe/Prague</entry>
+     </row>
+     <row>
       <entry>Europe/Riga</entry>
       <entry>Europe/Rome</entry>
       <entry>Europe/Samara</entry>
-     </row>
-     <row>
       <entry>Europe/San_Marino</entry>
       <entry>Europe/Sarajevo</entry>
+     </row>
+     <row>
       <entry>Europe/Simferopol</entry>
       <entry>Europe/Skopje</entry>
       <entry>Europe/Sofia</entry>
-     </row>
-     <row>
       <entry>Europe/Stockholm</entry>
       <entry>Europe/Tallinn</entry>
+     </row>
+     <row>
       <entry>Europe/Tirane</entry>
       <entry>Europe/Tiraspol</entry>
       <entry>Europe/Uzhgorod</entry>
-     </row>
-     <row>
       <entry>Europe/Vaduz</entry>
       <entry>Europe/Vatican</entry>
-      <entry>Europe/Vienna</entry>
-      <entry>Europe/Vilnius</entry>
-      <entry>Europe/Warsaw</entry>
      </row>
      <row>
+      <entry>Europe/Vienna</entry>
+      <entry>Europe/Vilnius</entry>
+      <entry>Europe/Volgograd</entry>
+      <entry>Europe/Warsaw</entry>
       <entry>Europe/Zagreb</entry>
+     </row>
+     <row>
       <entry>Europe/Zaporozhye</entry>
       <entry>Europe/Zurich</entry>
      </row>
     </tbody>
    </tgroup>
   </table>
-  <note>
-   <simpara>
-    The latest version of the timezone database can be installed via PECL's
-    <ulink url="&url.pecl.package.get;timezonedb">timezonedb</ulink>.
-    For Windows users, a pre-compiled DLL can be downloaded from the PECL4Win
-    site: <ulink url="&url.pecl.timezonedb.dll;">php_timezonedb.dll</ulink>.
-   </simpara>
-  </note>
  </sect1>
 
  <sect1 id="timezones.indian">
@@ -720,14 +676,6 @@
     </tbody>
    </tgroup>
   </table>
-  <note>
-   <simpara>
-    The latest version of the timezone database can be installed via PECL's
-    <ulink url="&url.pecl.package.get;timezonedb">timezonedb</ulink>.
-    For Windows users, a pre-compiled DLL can be downloaded from the PECL4Win
-    site: <ulink url="&url.pecl.timezonedb.dll;">php_timezonedb.dll</ulink>.
-   </simpara>
-  </note>
  </sect1>
 
  <sect1 id="timezones.pacific">
@@ -795,14 +743,6 @@
     </tbody>
    </tgroup>
   </table>
-  <note>
-   <simpara>
-    The latest version of the timezone database can be installed via PECL's
-    <ulink url="&url.pecl.package.get;timezonedb">timezonedb</ulink>.
-    For Windows users, a pre-compiled DLL can be downloaded from the PECL4Win
-    site: <ulink url="&url.pecl.timezonedb.dll;">php_timezonedb.dll</ulink>.
-   </simpara>
-  </note>
  </sect1>
 
  <sect1 id="timezones.others">
@@ -977,16 +917,9 @@
      for backward compatible reasons.
    </simpara>
   </note>
-  <note>
-   <simpara>
-    The latest version of the timezone database can be installed via PECL's
-    <ulink url="&url.pecl.package.get;timezonedb">timezonedb</ulink>.
-    For Windows users, a pre-compiled DLL can be downloaded from the PECL4Win
-    site: <ulink url="&url.pecl.timezonedb.dll;">php_timezonedb.dll</ulink>.
-   </simpara>
-  </note>
  </sect1>
-</appendix>  
+</appendix>
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -1007,4 +940,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=php
 vi: ts=4 sw=1
 -->
-