diff --git a/ChangeLog b/ChangeLog
index 08f13229..7f60d3bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-04  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/vipw.8.xml: Fix formatting typo.
+	* man/vipw.8.xml: Document the login.defs parameters only when tcb
+	is enabled.
+
 2010-04-04  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/useradd.c: spool is a constant string.
diff --git a/man/vipw.8.xml b/man/vipw.8.xml
index f805e0a6..29c4816b 100644
--- a/man/vipw.8.xml
+++ b/man/vipw.8.xml
@@ -127,7 +127,7 @@
     </variablelist>
   </refsect1>
 
-  <refsect1 id='configuration'>
+  <refsect1 id='configuration' condition="tcb">
     <title>CONFIGURATION</title>
     <para>
       The following configuration variables in
@@ -154,7 +154,7 @@
 	  <para>Editor to be used if <option>VISUAL</option> is not set.</para>
 	</listitem>
       </varlistentry>
-    <variablelist>
+    </variablelist>
   </refsect1>
 
   <refsect1 id='files'>