diff --git a/ChangeLog b/ChangeLog
index 2c1744d7..11162b68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-21  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/login.1.xml: Indicate that login should be executed with
+	"exec login" if called from a shell.
+
 2008-05-21  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* man/passwd.1.xml: Remove the advices for the choice of a good
diff --git a/man/login.1.xml b/man/login.1.xml
index e577bd94..2380f242 100644
--- a/man/login.1.xml
+++ b/man/login.1.xml
@@ -75,9 +75,11 @@
       with the system. It is normally invoked automatically by responding to
       the <emphasis remap='I'>login:</emphasis> prompt on the user's
       terminal. <command>login</command> may be special to the shell and may
-      not be invoked as a sub-process. Typically, <command>login</command>
-      is treated by the shell as <emphasis remap='B'>exec login</emphasis>
-      which causes the user to exit from the current shell. Attempting to
+      not be invoked as a sub-process. When called from a shell,
+      <command>login</command> should be executed as
+      <emphasis remap='B'>exec login</emphasis> which will cause the user
+      to exit from the current shell (and thus will prevent the new logged
+      in user to return to the session of the caller). Attempting to
       execute <command>login</command> from any shell but the login shell
       will produce an error message.
     </para>