diff --git a/pom.xml b/pom.xml
index c25b5aa705ccfdeb7bd69e8dd021fbc03966aa1d..b6a436e85debee759ec238cda4a0a6c07b8e190e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -351,7 +351,7 @@
           <links>
             <link>http://download.oracle.com/javase/1.6.0/docs/api/</link>
             <link>http://commons.apache.org/math/apidocs/</link>
-            <link>https://www.orekit.org/static/apidocs/index.html</link>
+            <link>https://www.orekit.org/static/apidocs/</link>
           </links>
           <charset>${project.reporting.outputEncoding}</charset>
         </configuration>
diff --git a/src/site/markdown/building.md b/src/site/markdown/building.md
index b75c3bf05e62315be4e0417e07f9b9344efafd4a..d2ed5ae97d62bd27b82c0d3f5c5e0112ddb78a26 100644
--- a/src/site/markdown/building.md
+++ b/src/site/markdown/building.md
@@ -86,6 +86,7 @@ The simplest way to use Rugged with Eclipse is to follow these steps:
 	* aster/src/main/resources
 	* core/src/test/resources
 	* aster/src/test/resources
+
     in the source tab of the Configure Build Path dialog
 
   * set the external libraries to JRE system library (provided by Eclipse),
diff --git a/src/site/markdown/contact.md b/src/site/markdown/contact.md
index 93545a6aa97718109ad9f28a02c0defb09d4047c..06209bee6f545978340a9ca20aaefd821333ffdd 100644
--- a/src/site/markdown/contact.md
+++ b/src/site/markdown/contact.md
@@ -20,15 +20,11 @@ Mailing lists
 
 Most discussions should occur on the public mailing lists.
 
-|---------------|------------------------------|------------------------------------------------------------|-------------------------------------------------------|
-|     topic     |         post address         |                      subscribe URL                         |                      archive URL                      |
-|---------------|------------------------------|------------------------------------------------------------|-------------------------------------------------------|
-|  announces    | orekit-announces@orekit.org  |  {{https://www.orekit.org/wws/subscribe/orekit-announces}} |  {{https://www.orekit.org/wws/arc/orekit-announces}}  |
-|---------------|------------------------------|------------------------------------------------------------|-------------------------------------------------------|
-|     users     |   orekit-users@orekit.org    |  {{https://www.orekit.org/wws/subscribe/orekit-users}}     |  {{https://www.orekit.org/wws/arc/orekit-users}}      |
-|---------------|------------------------------|------------------------------------------------------------|-------------------------------------------------------|
-|   developers  | orekit-developers@orekit.org | {{https://www.orekit.org/wws/subscribe/orekit-developers}} |  {{https://www.orekit.org/wws/arc/orekit-developers}} |
-|---------------|------------------------------|------------------------------------------------------------|-------------------------------------------------------|
+|---------------|------------------------------|--------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|
+|     topic     |         post address         |                                            subscribe URL                                                           |                                               archive URL                                            |
+|  announces    | orekit-announces@orekit.org  |   [https://www.orekit.org/wws/subscribe/orekit-announces](https://www.orekit.org/wws/subscribe/orekit-announces)   | [https://www.orekit.org/wws/arc/orekit-announces](https://www.orekit.org/wws/arc/orekit-announces)   |
+|     users     |   orekit-users@orekit.org    |   [https://www.orekit.org/wws/subscribe/orekit-users](https://www.orekit.org/wws/subscribe/orekit-users)           | [https://www.orekit.org/wws/arc/orekit-users](https://www.orekit.org/wws/arc/orekit-users)           |
+|   developers  | orekit-developers@orekit.org |   [https://www.orekit.org/wws/subscribe/orekit-developers](https://www.orekit.org/wws/subscribe/orekit-developers) | [https://www.orekit.org/wws/arc/orekit-developers](https://www.orekit.org/wws/arc/orekit-developers) |
 
 Please register to these mailing lists before attempting to post!
 
@@ -50,7 +46,7 @@ please use the following address:
 
 |:---------------------------------------------------------------------|
 |  CS Systèmes d'Information                                           |
-|  Business Unit Espace et Renseignement                               |
+|  BU E-space & Geoinformation                                         |
 |  parc de la plaine - 5 rue Brindejonc des Moulinais                  |
 |  BP 15872                                                            |
 |  31506 Toulouse CEDEX 5                                              |
diff --git a/src/site/markdown/downloads.md b/src/site/markdown/downloads.md
index c3fecbf661e6e56659f13f447a91b63e8fc9899b..9caab5a54edade97d14ad982e20181885430e156 100644
--- a/src/site/markdown/downloads.md
+++ b/src/site/markdown/downloads.md
@@ -40,5 +40,6 @@ ones since the other packages (binary jars, javadoc jars and even the bulk
 of this site) are created from these sources.
 
 Rugged is also available in maven central repository,
-with groupID org.orekit and artifactId orekit, so maven internal mechanism
-will download automatically all artifacts and dependencies as required.
+with groupID org.orekit and artifactId rugged-core, rugged-aster, ... so maven
+internal mechanism will download automatically all artifacts and dependencies
+as required.
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 45133c77139f0543d0daeed76eb2308899abd5e0..3d8121afd0b563fed372ed34ba57095eea6ff93a 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -17,7 +17,7 @@ Overview
 
   Rugged is an add-on for Orekit handling Digital Elevation Models
   contribution to line of sight computation. It is a free software
-  low-level library written in Java.
+  intermediate-level library written in Java.
 
   It mainly provides direct and inverse localization, i.e. it allows
   to compute accurately which ground point is looked at from a specific
@@ -27,9 +27,36 @@ Overview
 Features
 --------
 
-  * Direct localization
+  * Direct/inverse localization
 
-  * Inverse localization
+  * can support several types of Digital Elevation Models, including user-provided models
+
+  * several intersection models algorithms available
+
+  * can propagate orbit by itself for preliminary mission analysis or data generation
+
+  * can propagate attitude by itself for preliminary mission analysis or data generation
+
+  * *very* fast
+
+  * Both modern and legacy models for Earth rotation
+    * Lieske (1976), Wahr (1980), 
+    * Mathews, Herring, Buffett (2002)
+    * Capitaine (2006)
+
+  * complete set of corrections applied for greater accuracy
+    * δΔψ, δΔε on precession nutation (about 3m correction since 2013, steadily increasing)
+    * ΔUT₁, lod on proper rotation (can theoretically reach up to 400m)
+    * u, v pole wander (polhody), (about 15m correction)
+    * light time correction (about 1.2m)
+    * aberration of light correction (about 20m)
+    * line-of-sight curvature in geodetic coordinates,
+      (0m at nadir, 10m at 30° dive angle, hundreds of meters for skimming los)
+    * refraction not available in early 2014, but expected to be added soon
+
+  * not limited to Earth
+
+  * highly portable (Linux, Windows, MacOSX, ...)
 
   * Localized in several languages
 
@@ -37,8 +64,6 @@ Features
 
     * French
 
-    * Galician
-
 Free software
 -------------
 
@@ -49,7 +74,7 @@ It is distributed under the [Apache License Version 2.0](./license.html). This
 is a well known business-friendly license. This means anybody can use it to build
 any application, free or not. There are no strings attached to your own code.
 
-Everybody is encouraged to use Orekit as a common low level layer to improve
+Everybody is encouraged to use Rugged as a common intermediate level layer to improve
 interoperability in space systems.
 
 Maintained library
@@ -59,5 +84,5 @@ Rugged has been in development since 2013 inside [CS Systèmes
 d'Information](http://www.c-s.fr/) and is still used and maintained by its dual teams
 of space dynamics and image processing experts.
 
-Rugged is used for image processing of the Sentinel 2 missiong at European Space
+Rugged is used for image processing of the Sentinel 2 mission at European Space
 Agency (ESA).
diff --git a/src/site/resources/images/cs_logiciel_dev_32pixelsgri.png b/src/site/resources/images/cs_logiciel_dev_32pixelsgri.png
deleted file mode 100644
index 451436231979e9d325c42e39250ed270edfa9b37..0000000000000000000000000000000000000000
Binary files a/src/site/resources/images/cs_logiciel_dev_32pixelsgri.png and /dev/null differ
diff --git a/src/site/resources/images/logo_cs_2008_baseline_ang.jpg b/src/site/resources/images/logo_cs_2008_baseline_ang.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6048a9c633821780b68be257486b7c963f92cfb5
Binary files /dev/null and b/src/site/resources/images/logo_cs_2008_baseline_ang.jpg differ
diff --git a/src/site/resources/images/orekit-logo.png b/src/site/resources/images/orekit-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..66e4d11367b191e6b12783c897081f88327a5d66
Binary files /dev/null and b/src/site/resources/images/orekit-logo.png differ
diff --git a/src/site/resources/images/rugged-logo.png b/src/site/resources/images/rugged-logo.png
index 55e0717ed58d522ffe9b76d6e038968dc8fa50ce..16ced1419a788f1026ffc0fb4482f19bd71edbe4 100644
Binary files a/src/site/resources/images/rugged-logo.png and b/src/site/resources/images/rugged-logo.png differ
diff --git a/src/site/site.xml b/src/site/site.xml
index 8641773014df59d25e94fcca035841aa021e17a2..c19247d88d4b2c8d3fa320039dc1d4f3af4cc092 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -16,7 +16,7 @@
 <project name="Rugged">
   <bannerLeft>
     <name>CS Syst&#232;mes d&#039;Information</name>
-    <src>/images/cs_logiciel_dev_32pixelsgri.png</src>
+    <src>/images/logo_cs_2008_baseline_ang.jpg</src>
     <href>http://www.c-s.fr/</href>
   </bannerLeft>
   <bannerRight>
@@ -45,4 +45,11 @@
       </menu>
     <menu ref="reports"/>
   </body>
+  <poweredBy>
+    <logo name="orekit"
+          href="https://www.orekit.org/"
+          img="/images/orekit-logo.png"
+          alt="orekit"
+          width="100" />
+  </poweredBy>
 </project>