diff --git a/ChangeLog b/ChangeLog
index 0f41f4f9..3ea3b846 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* man/login.defs.d/UMASK.xml: Indicate how UMASK is used and
 	limitations.
 	* man/limits.5.xml: Remove space before an end of tag.
+	* man/useradd.8.xml, man/login.defs.d/CREATE_HOME.xml,
+	man/login.defs.5.xml: Document the CREATE_HOME variable.
 
 2009-01-06  Sebastian Rick Rijkers  <srrijkers@gmail.com>
 
diff --git a/man/login.defs.5.xml b/man/login.defs.5.xml
index be95eb0f..d5a448aa 100644
--- a/man/login.defs.5.xml
+++ b/man/login.defs.5.xml
@@ -36,6 +36,7 @@
 <!ENTITY CHSH_AUTH             SYSTEM "login.defs.d/CHSH_AUTH.xml">
 <!ENTITY CONSOLE               SYSTEM "login.defs.d/CONSOLE.xml">
 <!ENTITY CONSOLE_GROUPS        SYSTEM "login.defs.d/CONSOLE_GROUPS.xml">
+<!ENTITY CREATE_HOME           SYSTEM "login.defs.d/CREATE_HOME.xml">
 <!ENTITY DEFAULT_HOME          SYSTEM "login.defs.d/DEFAULT_HOME.xml">
 <!ENTITY ENCRYPT_METHOD        SYSTEM "login.defs.d/ENCRYPT_METHOD.xml">
 <!ENTITY ENV_HZ                SYSTEM "login.defs.d/ENV_HZ.xml">
@@ -142,6 +143,7 @@
       &CHSH_AUTH;
       &CONSOLE;
       &CONSOLE_GROUPS;
+      &CREATE_HOME;
       &DEFAULT_HOME;
       &ENCRYPT_METHOD;
       &ENV_HZ;
@@ -419,7 +421,7 @@
 	<term>useradd</term>
 	<listitem>
 	  <para>
-	    <!-- RedHat: CREATE_HOME-->
+	    CREATE_HOME
 	    GID_MAX GID_MIN
 	    MAIL_DIR MAX_MEMBERS_PER_GROUP
 	    PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE
diff --git a/man/login.defs.d/CREATE_HOME.xml b/man/login.defs.d/CREATE_HOME.xml
new file mode 100644
index 00000000..e68f24af
--- /dev/null
+++ b/man/login.defs.d/CREATE_HOME.xml
@@ -0,0 +1,41 @@
+<!--
+   Copyright (c) 2009       , Nicolas François
+   All rights reserved.
+  
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+   3. The name of the copyright holders or contributors may not be used to
+      endorse or promote products derived from this software without
+      specific prior written permission.
+  
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+   HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<varlistentry>
+  <term><option>CREATE_HOME</option> (boolean)</term>
+  <listitem>
+    <para>
+      Indicate if a home directory should be created by default for new
+      users.
+    </para>
+    <para>
+      This setting does not apply to system users, and can be overriden on
+      the command line.
+    </para>
+  </listitem>
+</varlistentry>
diff --git a/man/useradd.8.xml b/man/useradd.8.xml
index c41757ee..aa11e56c 100644
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
@@ -30,6 +30,7 @@
 -->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY CREATE_HOME           SYSTEM "login.defs.d/CREATE_HOME.xml">
 <!ENTITY GID_MAX               SYSTEM "login.defs.d/GID_MAX.xml">
 <!ENTITY MAIL_DIR              SYSTEM "login.defs.d/MAIL_DIR.xml">
 <!ENTITY MAX_MEMBERS_PER_GROUP SYSTEM "login.defs.d/MAX_MEMBERS_PER_GROUP.xml">
@@ -599,6 +600,7 @@
       tool:
     </para>
     <variablelist>
+      &CREATE_HOME;
       &GID_MAX; <!-- documents also GID_MIN -->
       &MAIL_DIR;
       &MAX_MEMBERS_PER_GROUP;