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
@@ -1141,15 +1141,20 @@
 
     <important>
       <para>Ports should not be created for Go libs, see
-        <xref linkend="go-libs"/> for more information.</para>
+	<xref linkend="go-libs"/> for more information.</para>
     </important>
 
-    <para>Possible arguments: (none)</para>
+    <para>Possible arguments: (none),
+      <literal>modules</literal></para>
 
     <para>Sets default values and targets used to build
       <application>Go</application> software.  A build-time dependency
-      on <package role="port">lang/go</package> is added.  The build
-      process is controlled by several variables:</para>
+      on <package role="port">lang/go</package> is added.  By default
+      the build is performed in GOPATH mode.  If Go software uses
+      modules, the modules-aware mode can be switched on with
+      <literal>modules</literal>.</para>
+
+    <para>The build process is controlled by several variables:</para>
 
     <variablelist>
       <varlistentry>
@@ -1157,9 +1162,16 @@
 
 	<listitem>
 	  <para>The name of the <application>Go</application> package.
-	    This is the directory that will be created in
-	    <literal>GOPATH/src</literal>.  The default value is
-	    <varname>${PORTNAME}</varname>.</para>
+	    When building in GOPATH mode, this is the directory that
+	    will be created in <literal>${GOPATH}/src</literal> and
+	    seen by the <command>go</command>.  When building in
+	    modules-aware mode, no GOPATH directories will be created
+	    and <varname>GO_PKGNAME</varname> value will be only used
+	    as a default for <varname>GO_TARGET</varname>.  If not set
+	    explicitly and <varname>GH_SUBDIR</varname> is present,
+	    <varname>GO_PKGNAME</varname> value will be inferred from
+	    <varname>${GH_SUBDIR}</varname>, otherwise it will be set
+	    to  <varname>${PORTNAME}</varname>.</para>
 	</listitem>
       </varlistentry>
 
@@ -1191,6 +1203,15 @@
 	    <command>go</command>.</para>
 	</listitem>
       </varlistentry>
+
+      <varlistentry>
+	<term><varname>GO_BUILDFLAGS</varname></term>
+
+	<listitem>
+	  <para>Additional build arguments to be passed to the
+	    <command>go install</command>.</para>
+	</listitem>
+      </varlistentry>
     </variablelist>
   </sect1>