diff --git a/man/vipw.8.xml b/man/vipw.8.xml
index 4caddcbe..a802bde1 100644
--- a/man/vipw.8.xml
+++ b/man/vipw.8.xml
@@ -73,10 +73,20 @@
       the appropriate locks to prevent file corruption. When looking for an
       editor, the programs will first try the environment variable
       <envar>$VISUAL</envar>, then the environment variable
-      <envar>$EDITOR</envar>, and finally the default editor,
+      <envar>$EDITOR</envar>, then the editor from
+      <filename>~/.selected_editor</filename>, and finally
+      <command>nano</command>.
       <citerefentry><refentrytitle>vi</refentrytitle>
       <manvolnum>1</manvolnum></citerefentry>.
     </para>
+    <para>
+        On the first run, if the environment variables <envar>$VISUAL</envar>
+        and <envar>$EDITOR</envar> are both unset, this program asks you for
+        an editor and stores your selection in
+        <filename>~/.selected_editor</filename>. If the editor mentioned
+        therein does not exist on your system, the program will fall back
+        to using <command>nano</command>.
+    </para>
   </refsect1>
 
   <refsect1 id='options'>
@@ -210,6 +220,9 @@
       <citerefentry>
 	<refentrytitle>gshadow</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>
+      <citerefentry>
+          <refentrytitle>~/.selected_editor</refentrytitle><manvolnum>5</manvolnum>
+      </citerefentry>
       <citerefentry condition="tcb">
 	<refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,