diff --git a/documentation/credits.html b/documentation/credits.html
index d7c866ea07..1dde090630 100644
--- a/documentation/credits.html
+++ b/documentation/credits.html
@@ -38,17 +38,34 @@
     <li>Credits</li>
 </ul>
 <h1>Chamilo Credits</h1>
+<h2>Table of contents</h2>
+<ul>
+  <li><a href="#core-developers">Core developers</a></li>
+  <li><a href="#quality-assurance">Quality assurance</a></li>
+  <li><a href="#performance">System performance</a></li>
+  <li><a href="#tools">Tools</a></li>
+  <li><a href="#online-authoring">Online authoring</a></li>
+  <li><a href="#translations">Translations</a></li>
+  <li><a href="#documentation">Documentation</a></li>
+  <li><a href="#special-thanks">Special thanks</a></li>
+  <li><a href="#organisations">Organisations and institutions</a></li>
+  <li><a href="#deprecated-developments">Deprecated developments</a></li>
+  <li><a href="#association">The Chamilo Association</a></li>
+</ul>
 
+In the following credits, when possible, we tried to put the latest contributorsfirst, in order to show more clearly the contributions relevant to the present time.<br />
+
+<a name="core-developers"></a>
 <h1>Core developers</h1>
 <ol>
-  <li>BeezNest Latino (ex Dokeos Latinoamérica) (2008-2011)
+  <li>BeezNest Latino (ex Dokeos Latinoamérica) (2008-2012)
   <ul>
     <li>Yannick Warnier (ywarnier@beeznest.org) - Lead developer</li>
     <li>Julio Allen Montoya Armas (gugli100@gmail.com) - Lead Latino developer</li>
     <li>Christian Fasanando (christian534@hotmail.com) - 2009-2010</li>
   </ul>
   </li>
-  <li>Independent (2008-2011)
+  <li>Independent (2008-2012)
   <ul>
     <li> Juan Carlos Raña Trabado - considerable work on the wiki integration and improvements, and the FCKEditor/Mimetex extension as well as *many* FCKEditor's file manager and other modules improvements, as well as a continuous stream of recommendations that helped shape 1.8.5 and 1.8.6.*</li>
     <li> Ivan Tcholakov - various bugfixes in 1.8.6.*, very accurate bug reporting contributions and a considerable work in the integration of a new version of FCKEditor, along with a bunch of useful plugins and an exceptional work on internationalization</li>
@@ -87,8 +104,10 @@
     <li> Bart Mollet (bart.mollet@hogent.be)</li>
   </ul>
   </li>
+  <li>Université Catholique de Louvain (Claroline, 2001-2003)</li>
 </ol>
 
+<a name="quality-assurance"></a>
 <h1>Quality Assurance</h1>
 <ul>
   <li>Yannick Warnier as QA coordinator</li>
@@ -99,15 +118,18 @@
   <li>Ricardo Rodriguez</li>
 </ul>
 
+<a name="performance"></a>
 <h1>System performance</h1>
 <ul>
+  <li>Yannick Warnier - implementation of CDN, SQL improvements, memcached and documentation in the optimization guide</li>
+  <li>Ivan Tcholakov - language loading performances improvements in 1.8</li>
   <li>Arnaud Ligot</li>
   <li>Jérôme Warnier</li>
   <li>Ludwig Chauvin</li>
   <li>Ludovic Gasc</li>
-  <li>Yannick Warnier - implementation of memcached and documentation + optimization guide</li>
 </ul>
 
+<a name="tools"></a>
 <h1>Developments</h1>
 <h2>Announcement tool </h2>
 
@@ -459,6 +481,7 @@ rewritten by
   <li>Carlos Vargas (for extending the JFusion plugin to Dokeos 1.8.6)</li>
 </ul>
 
+<a name="online-authoring"></a>
 <h1>Online Authoring</h1>
 <h2>HTML Editor</h2>
 <ul>
@@ -498,9 +521,11 @@ rewritten by
 	<li>Laurent Opprecht</li>
 	<li>Nicolas Rod</li>
 </ul>
+<a name="translations"></a>
 <h1>Translations</h1>
 There are too much translators to list them all. Please check http://translate.chamilo.org <br />
 
+<a name="documentation"></a>
 <h1>Documentation</h1>
 <ul>
   <li>Arnaud Ligot</li>
@@ -521,8 +546,9 @@ There are too much translators to list them all. Please check http://translate.c
   <li>Sergio Infante Montero, for technical documentation translation to Spanish</li>
 </ul>
 
-<h1><a name="thanks-also">Thanks go also (in no particular order) to</a></h1>
-
+<a name="special-thanks"></a>
+<h1>Our special thanks also go to</h1>
+(in no particular order)
 <ul>
   <li> Hubert Borderiou for various bugfixes</li>
   <li> Philippe Béranger</li>
@@ -598,7 +624,8 @@ There are too much translators to list them all. Please check http://translate.c
   <li>All the supporting parents, partners, children, friends, colleagues and sometimes students, of the very special geeks that we are, for their continous support and inspiration</li> 
 </ul>
 
-<h1>Contributing organizations (only registered since 2010)</h1>
+<a name="organisations"></a>
+<h1>Contributing organizations (only recorded since 2010)</h1>
 These institutions and companies have either contributed to the Chamilo project directly or through hiring services to contribute to Chamilo from an official provider:
 <ul>
   <li>Universidad San Ignacio de Loyola, Lima, Peru</li>
@@ -619,20 +646,20 @@ These institutions and companies have either contributed to the Chamilo project
 </ul>
 
 
-<h1>Removed developments</h1>
+<a name="deprecated-developments"></a>
+<h1>Deprecated developments</h1>
 <ul>
-  <li>Rich Text Editor (WYSIWYG html editor),  Kevin Roth<br />
-    now removed and replaced by HTMLarea</li>
-  <li>HTMLarea (WYSIWYG html editor)<br />
-    now removed and replaced by FCKeditor <br />
-  </li>
-  <li>Table of contents<br />
-    now removed, replaced by learning path<br />
-  </li>
+  <li>Rich Text Editor (WYSIWYG html editor),  Kevin Roth: now removed and replaced by HTMLarea</li>
+  <li>HTMLarea (WYSIWYG html editor): now removed and replaced by FCKeditor</li>
+  <li>Table of contents: now removed, replaced by learning path</li>
   <li>Facultad de Matematicas, UADY (México) (original asynchronous Message plugin, was later dumped)</li>
 </ul>
-</div>
 <br />
+<a name="association"></a>
+<h1>The Chamilo Association</h1>
+The Chamilo Association is very present inside the organizational structure of the Chamilo community, yet it tries to avoid interfering in the development of the software. It acts as a neutral organization supporting the development of the Chamilo software, and improving its popularity.
+To know more about the Chamilo Association and how to get involve, <a href="http://www.chamilo.org/en/association" target="_blank">&gt; start by reading its presentation &lt;</a>
+</div>
 
 <hr />
     <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10-blue" alt="Valid XHTML 1.0 Transitional" style="margin: 1em; float: right;" height="31" width="88" /></a>