diff --git a/ChangeLog b/ChangeLog
index 6e436ebf..dcda44ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-27  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/vipw.8.xml: Add section ENVIRONMENT.
+
 2010-03-26  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* etc/login.defs: Updated description of UMASK to indicate its
diff --git a/man/vipw.8.xml b/man/vipw.8.xml
index 1b47eef0..d0e9a614 100644
--- a/man/vipw.8.xml
+++ b/man/vipw.8.xml
@@ -139,6 +139,24 @@
     </variablelist>
   </refsect1>
 
+  <refsect1 id='environment'>
+    <title>ENVIRONMENT</title>
+    <variablelist>
+      <varlistentry>
+	<term><option>VISUAL</option></term>
+	<listitem>
+	  <para>Editor to be used.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><option>EDITOR</option></term>
+	<listitem>
+	  <para>Editor to be used if <option>VISUAL</option> is not set.</para>
+	</listitem>
+      </varlistentry>
+    <variablelist>
+  </refsect1>
+
   <refsect1 id='files'>
     <title>FILES</title>
     <variablelist>