diff --git a/docs/refguide.xml b/docs/refguide.xml
index ba7c27c13..58343e815 100644
--- a/docs/refguide.xml
+++ b/docs/refguide.xml
@@ -2240,18 +2240,21 @@ eligible to run.  The <literal>all</literal> argument should be used with cautio
 
 <para>
 File and directory names may be relative or absolute. Absolute names are
-used directly. Relative paths are looked for in the following places
-until found:
+used directly. Relative paths are looked for in the
+<filename>scripts</filename> of each of the following places until
+found:
 <indexterm><primary>data files</primary><secondary>directory search order</secondary></indexterm><indexterm><primary>scripts, location of</primary></indexterm>
 <simplelist>
 <member><option>--datadir</option></member>
 <member><envar>$NMAPDIR</envar><indexterm><primary><envar>NMAPDIR</envar> environment variable</primary></indexterm></member>
 <member><filename>~/.nmap</filename> (not searched on Windows)<indexterm><primary sortas="nmap directory"><filename>.nmap</filename> directory</primary></indexterm></member>
+<member>the directory containing the <filename>nmap</filename>
+executable</member>
+<member>the directory containing the <filename>nmap</filename>
+executable, followed by <filename>../share/nmap</filename></member>
 <member><varname>NMAPDATADIR</varname><indexterm><primary><varname>NMAPDATADIR</varname></primary></indexterm></member>
-<member>the current directory</member>
+<member>the current directory.</member>
 </simplelist>
-A <filename>scripts</filename> subdirectory is also tried in each of
-these.
 </para>
 
 <para>
@@ -4064,11 +4067,12 @@ hosts with at least one
           environment variable.
           Next comes
 	  <filename>~/.nmap</filename><indexterm><primary sortas="nmap directory"><filename>.nmap</filename> directory</primary></indexterm>
-          for real and effective UIDs (POSIX systems only) or location of
-          the Nmap executable (Win32 only), and then a compiled-in
-          location such as <filename>/usr/local/share/nmap</filename> or <filename>/usr/share/nmap</filename>
-          . As a last resort, Nmap will look in the current
-          directory.</para>
+          for real and effective UIDs (POSIX systems only). This is
+          followed by the location of the <filename>nmap</filename>
+          executable and the same location with
+          <code>../share/nmap</code> appended. Then a compiled-in
+          location such as <filename>/usr/local/share/nmap</filename> or <filename>/usr/share/nmap</filename>.
+          </para>
         </listitem>
       </varlistentry>
 
diff --git a/docs/scripting.xml b/docs/scripting.xml
index b94314fff..599f61403 100644
--- a/docs/scripting.xml
+++ b/docs/scripting.xml
@@ -618,18 +618,21 @@ eligible to run.  The <literal>all</literal> argument should be used with cautio
 
 <para>
 File and directory names may be relative or absolute. Absolute names are
-used directly. Relative paths are looked for in the following places
-until found:
+used directly. Relative paths are looked for in the
+<filename>scripts</filename> of each of the following places until
+found:
 <indexterm><primary>data files</primary><secondary>directory search order</secondary></indexterm><indexterm><primary>scripts, location of</primary></indexterm>
 <simplelist>
 <member><option>--datadir</option></member>
 <member><envar>$NMAPDIR</envar><indexterm><primary><envar>NMAPDIR</envar> environment variable</primary></indexterm></member>
 <member><filename>~/.nmap</filename> (not searched on Windows)<indexterm><primary sortas="nmap directory"><filename>.nmap</filename> directory</primary></indexterm></member>
-<member><varname>NMAPDATADIR</varname><indexterm><primary><varname>NMAPDATADIR</varname></primary></indexterm> (a value compiled into Nmap)</member>
-<member>the current directory</member>
+<member>the directory containing the <filename>nmap</filename>
+executable</member>
+<member>the directory containing the <filename>nmap</filename>
+executable, followed by <filename>../share/nmap</filename></member>
+<member><varname>NMAPDATADIR</varname><indexterm><primary><varname>NMAPDATADIR</varname></primary></indexterm></member>
+<member>the current directory.</member>
 </simplelist>
-A <filename>scripts</filename> subdirectory is also tried in each of
-these.
 </para>
 
 <para>