diff --git a/README.md b/README.md
index 22f7c87c0..0627fdde7 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Plexus IoC Container core with companion tools.
 
 ## Deprecated
 
-Plexus IoC Container is replaced by [Eclipse Sisu](https://www.eclipse.org/sisu/).
+Plexus IoC Container is replaced by [Eclipse Sisu](https://www.eclipse.org/sisu/): [sisu.inject](https://github.com/eclipse/sisu.inject), [sisu.plexus](https://github.com/eclipse/sisu.plexus), [sisu.mojos](https://github.com/eclipse/sisu.mojos/).
 
 ## Attention
 
diff --git a/plexus-component-metadata/src/site/apt/index.apt.vm b/plexus-component-metadata/src/site/apt/index.apt.vm
index c7c0b6a0b..6e082fa5d 100644
--- a/plexus-component-metadata/src/site/apt/index.apt.vm
+++ b/plexus-component-metadata/src/site/apt/index.apt.vm
@@ -64,3 +64,8 @@ ${project.name}
   Of course, patches are welcome, too. Contributors can check out the project from our
   {{{./source-repository.html}source repository}} and will find supplementary information in the
   {{{http://maven.apache.org/guides/development/guide-helping.html}guide to helping with Maven}}.
+
+* Deprecated
+
+  When using {{{https://www.eclipse.org/sisu/}Eclipse Sisu}} with {{{https://github.com/eclipse/sisu.plexus/wiki/Plexus-to-JSR330}JSR-330 <<<javax.inject>>> annotations}},
+  use {{{https://github.com/eclipse/sisu.mojos/} <<<sisu-maven-plugin>>>}} instead of Plexus Component Metadata Maven Plugin.
diff --git a/plexus-container-default/src/site/apt/index.apt b/plexus-container-default/src/site/apt/index.apt
index 6288061e7..9bbe8284c 100644
--- a/plexus-container-default/src/site/apt/index.apt
+++ b/plexus-container-default/src/site/apt/index.apt
@@ -35,6 +35,9 @@ Overview
 
 * Deprecated
 
-  <<<plexus-default-container>>> is replaced by {{{https://github.com/eclipse/sisu.inject}Sisu container}}
-  and its {{{https://github.com/eclipse/sisu.plexus}Plexus shim <<<org.eclipse.sisu.plexus>>>}}
-  ({{{https://eclipse.github.io/sisu.plexus/apidocs/reference/packages.html}javadoc}}).
\ No newline at end of file
+  <<<plexus-default-container>>> is replaced by:
+
+  * {{{https://github.com/eclipse/sisu.inject}Sisu container}}, reading <<<META-INF/sisu/javax.inject.Named>>> index files,
+
+  * and optional {{{https://github.com/eclipse/sisu.plexus}Plexus shim <<<org.eclipse.sisu.plexus>>>}} for compatibility with legacy Plexus <<<META-INF/plexus/components.xml>>>.
+  See also Plexus shim {{{https://eclipse.github.io/sisu.plexus/apidocs/reference/packages.html}javadoc}}.
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index db99a70c7..5caa7bc50 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -1,5 +1,5 @@
  -----
- plexus-containers
+ plexus-containers (deprecated)
  -----
  Hervé Boutemy
  -----
@@ -16,7 +16,7 @@ Overview
 
  and companion tools:
  
-  * {{{./plexus-component-metadata}plexus-component-metadata}}(-maven-plugin) is a Maven plugin to generate plexus <<<{{{./plexus-container-default/plexus-components.html}component.xml}}>>> from
+  * {{{./plexus-component-metadata}plexus-component-metadata}}(-maven-plugin) is a Maven plugin to generate Plexus' <<<{{{./plexus-container-default/plexus-components.html}component.xml}}>>> from
   source javadoc tags and Java 5 class annotations,
 
   * {{{./plexus-component-annotations}plexus-component-annotations}} provides the Java 5 annotations for plexus components,
@@ -30,4 +30,6 @@ Overview
   
 * Deprecated
 
-  Plexus Containers is deprecated, replaced by {{{https://www.eclipse.org/sisu/}Eclipse Sisu}}: see each component documentation for more details.
+  Plexus Containers is deprecated, replaced by {{{https://www.eclipse.org/sisu/}Eclipse Sisu}}
+  ({{{https://github.com/eclipse/sisu.inject}sisu.inject}}, {{{https://github.com/eclipse/sisu.plexus}sisu.plexus}}, {{{https://github.com/eclipse/sisu.mojos}sisu.mojos}}):
+  see each Plexus Containers component (container, Maven plugin and annotations) documentation for more details on how to replace each one.