Index: en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
@@ -1167,16 +1167,48 @@
       <application>Perl</application>, <application>PHP</application>,
       <application>Python</application>,
       <application>Ruby</application>, <application>Tcl</application>,
-      and <application>Tk</application> are supported by default.  To
-      support another interpreter, set
-      <varname>SHEBANG_LANG</varname>,
-      <varname><replaceable>interp</replaceable>_OLD_CMD</varname> and
-      <varname><replaceable>interp</replaceable>_CMD</varname>.  For
-      example:</para>
-
-    <programlisting>SHEBANG_LANG=	lua
-lua_OLD_CMD=	/usr/bin/lua
-lua_CMD=	${LOCALBASE}/bin/lua</programlisting>
+      and <application>Tk</application> are supported by
+      default.</para>
+
+    <para>There are three configuration variables:</para>
+
+    <variablelist>
+      <varlistentry>
+	<term><varname>SHEBANG_LANG</varname></term>
+
+	<listitem>
+	  <para>The list of supported interpreters.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><varname><replaceable>interp</replaceable>_CMD</varname></term>
+
+	<listitem>
+	  <para>The correct path to the command interpreter.  The
+	    default value is
+	    <literal>${LOCALBASE}/bin/<replaceable>interp</replaceable></literal>.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><varname><replaceable>interp</replaceable>_OLD_CMD</varname></term>
+	<listitem>
+	  <para>The list of wrong invocations of interpreters.  They
+	    will be replaced by the correct path in
+	    <varname><replaceable>interp</replaceable>_CMD</varname>.
+	    This list will always be part of it:
+	    <literal>"/usr/bin/env <replaceable>interp</replaceable>"
+	      /bin/<replaceable>interp</replaceable>
+	      /usr/bin/<replaceable>interp</replaceable></literal>.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+
+    <para>To add another interpreter, set
+      <varname>SHEBANG_LANG</varname>.  For example:</para>
+
+    <programlisting>SHEBANG_LANG=	lua</programlisting>
 
     <para><literal><replaceable>interp</replaceable>_OLD_CMD</literal>
       will contain multiple values.  Any entry with spaces must be
@@ -1231,22 +1263,25 @@
   <sect1 xml:id="uses-tcl">
     <title><literal>tcl</literal></title>
 
-    <para>Possible arguments: <literal>PORT</literal></para>
-
-    <para>Add a dependency on <application>Tcl</application>.  The
-      <literal>PORT</literal> parameter can be either
-      <literal>tcl</literal> or <literal>tk</literal>.  Either a
-      version or wrapper dependency can be appended using
-      <literal>PORT:version</literal> or
-      <literal>PORT:wrapper</literal>.  The version can be empty, one
-      or more exact version numbers (currently <literal>84</literal>,
-      <literal>85</literal>, or <literal>86</literal>), or a minimal
-      version number (currently <literal>84+</literal>,
-      <literal>85+</literal> or <literal>86+</literal>).  A build- or
-      run-time only dependency can be specified using
-      <literal>PORT,build</literal> or <literal>PORT,run</literal>.
-      After including <filename>bsd.port.pre.mk</filename> the port
-      can inspect the results using these variables:</para>
+    <para>Possible arguments: <replaceable>version</replaceable>,
+      <literal>wrapper</literal>, <literal>build</literal>,
+      <literal>run</literal>, <literal>tea</literal></para>
+
+    <para>Add a dependency on <application>Tcl</application>.  A
+      specific version can be requested using
+      <replaceable>version</replaceable>.  The version can be empty,
+      one or more exact version numbers (currently
+      <literal>84</literal>, <literal>85</literal>, or
+      <literal>86</literal>), or a minimal version number (currently
+      <literal>84+</literal>, <literal>85+</literal> or
+      <literal>86+</literal>).  To only request a non version specific
+      wrapper, use <literal>wrapper</literal>.  A build- or run-time
+      only dependency can be specified using <literal>build</literal>
+      or <literal>run</literal>.  To build the port using the
+      <application>Tcl Extension Architecture</application>, use
+      <literal>tea</literal>.  After including
+      <filename>bsd.port.pre.mk</filename> the port can inspect the
+      results using these variables:</para>
 
     <itemizedlist>
       <listitem>