diff --git a/ChangeLog b/ChangeLog
index 6f09795b..3b636486 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-18  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/usermod.8.xml: Split the CAVEAT section in paragraphs.
+	Updated information on the user_busy check.
+
 2009-05-18  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* man/userdel.8.xml: Document tat -f may force teh deletion of a
diff --git a/man/usermod.8.xml b/man/usermod.8.xml
index 7eb1450d..793644e9 100644
--- a/man/usermod.8.xml
+++ b/man/usermod.8.xml
@@ -327,13 +327,19 @@
   <refsect1 id='caveats'>
     <title>CAVEATS</title>
     <para>
-      <command>usermod</command> will not allow you to change the name of an
-      user who is logged in. You must make certain that the named user is
+      You must make certain that the named user is
       not executing any processes when this command is being executed if the
-      user's numerical user ID is being changed. You must change the owner
-      of any <command>crontab</command> files manually. You must change
-      the owner of any <command>at</command> jobs manually. You must make
-      any changes involving NIS on the NIS server.
+      user's numerical user ID, the user's name, or the user's home
+      directory is being changed. <command>usermod</command> checks this
+      on Linux, but only check if the user is logged in according to utmp
+      on other architectures.
+    </para>
+    <para>
+      You must change the owner of any <command>crontab</command> files or
+      <command>at</command> jobs manually.
+    </para>
+    <para>
+      You must make any changes involving NIS on the NIS server.
     </para>
   </refsect1>