Index: en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
@@ -4122,83 +4122,128 @@
   <sect1 xml:id="using-xfce">
     <title>Using Xfce</title>
 
-    <para><varname>USE_XFCE</varname> is used to
-      autoconfigure the dependencies for ports which use an Xfce
-      based library or application like
-      <package role="port">x11-toolkits/libxfce4gui</package>
-      and <package role="port">x11-wm/xfce4-panel</package>.</para>
+    <para>Ports that need <application>Xfce</application> libraries or
+      applications set <literal>USES=xfce</literal>.</para>
 
-    <para>These Xfce libraries and applications are
-      recognized:</para>
+    <para>Specific <application>Xfce</application> library and
+      application dependencies are set with values assigned to
+      <varname>USE_XFCE</varname>.  They are defined in
+      <filename>/usr/ports/Mk/Uses/xfce.mk</filename>.  The possible
+      values are:</para>
 
-    <itemizedlist>
-      <listitem>
-	<para>libexo: <package
-	    role="port">x11/libexo</package></para>
-      </listitem>
+    <variablelist>
+      <title>Values of <varname>USE_XFCE</varname></title>
 
-      <listitem>
-	<para>libgui: <package
-	    role="port">x11-toolkits/libxfce4gui</package></para>
-      </listitem>
+      <varlistentry>
+	<term>garcon</term>
 
-      <listitem>
-	<para>libutil: <package
-	    role="port">x11/libxfce4util</package></para>
-      </listitem>
+	<listitem>
+	  <para><package role="port">sysutils/garcon</package></para>
+	</listitem>
+      </varlistentry>
 
-      <listitem>
-	<para>libmcs: <package
-	    role="port">x11/libxfce4mcs</package></para>
-      </listitem>
+      <varlistentry>
+	<term>libexo</term>
 
-      <listitem>
-	<para>mcsmanager: <package
-	    role="port">sysutils/xfce4-mcs-manager</package></para>
-      </listitem>
+	<listitem>
+	  <para><package role="port">x11/libexo</package></para>
+	</listitem>
+      </varlistentry>
 
-      <listitem>
-	<para>panel: <package
-	    role="port">x11-wm/xfce4-panel</package></para>
-      </listitem>
+      <varlistentry>
 
-      <listitem>
-	<para>thunar: <package
-	    role="port">x11-fm/thunar</package></para>
-      </listitem>
+	<term>libgui</term>
 
-      <listitem>
-	<para>wm: <package
-	    role="port">x11-wm/xfce4-wm</package></para>
-      </listitem>
+	<listitem>
+	  <para><package
+	      role="port">x11-toolkits/libxfce4gui</package></para>
+	</listitem>
+      </varlistentry>
 
-      <listitem>
-	<para>xfdev: <package
-	    role="port">dev/xfce4-dev-tools</package></para>
-      </listitem>
-    </itemizedlist>
+      <varlistentry>
+	<term>libmenu</term>
 
-    <para>These additional parameters are recognized:</para>
+	<listitem>
+	  <para><package role="port">x11/libxfce4menu</package></para>
+	</listitem>
+      </varlistentry>
 
-    <itemizedlist>
-      <listitem>
-	<para>configenv: Use this if the port requires a special
-	  modified <varname>CONFIGURE_ENV</varname> to find its
-	  required libraries.</para>
+      <varlistentry>
+	<term>libutil</term>
 
-	<programlisting>-I&dollar;{LOCALBASE}/include -L&dollar;{LOCALBASE}/lib</programlisting>
+	<listitem>
+	  <para><package role="port">x11/libxfce4util</package></para>
+	</listitem>
+      </varlistentry>
 
-	<para>gets added to CPPFLAGS to
-	  <varname>CONFIGURE_ENV</varname>.</para>
-      </listitem>
-    </itemizedlist>
+      <varlistentry>
+	<term>panel</term>
 
-    <para>Therefore, if a port has a dependency on
-      <package role="port">sysutils/xfce4-mcs-manager</package>
-      and requires the special CPPFLAGS in its configure
-      environment, the syntax will be:</para>
+	<listitem>
+	  <para><package
+	      role="port">x11-wm/xfce4-panel</package></para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>thunar</term>
+
+	<listitem>
+	  <para><package role="port">x11-fm/thunar</package></para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>xfconf</term>
+
+	<listitem>
+	  <para><package role="port">x11/xfce4-conf</package></para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+
+    <example xml:id="use-xfce">
+      <title><varname>USES=xfce</varname> Example</title>
+
+      <programlisting>USES=		xfce
+USE_XFCE=	libmenu</programlisting>
+    </example>
+
+    <example xml:id="use-xfce-gtk3">
+      <title>Using Xfce's Own GTK3 Widgets</title>
+
+      <para>In this example, the ported application uses the
+	<application>GTK3</application>-specific widgets <package
+	  role="port">x11/libxfce4menu</package> and <package
+	  role="port">x11/xfce4-conf</package>.</para>
+
+      <programlisting>USES=		xfce:gtk3
+USE_XFCE=	libmenu xfconf</programlisting>
+    </example>
+
+    <tip>
+      <para><application>Xfce</application> components included this
+	way will automatically include any dependencies they need.  It
+	is no longer necessary to specify the entire list.  If the
+	port only needs <package
+	  role="port">x11-wm/xfce4-panel</package>, use:</para>
+
+      <programlisting>USES=		xfce
+USE_XFCE=	panel</programlisting>
+
+      <para>There is no need to list the components <package
+	  role="port">x11-wm/xfce4-panel</package> needs itself like
+	this:</para>
+
+      <programlisting>USES=		xfce
+USE_XFCE=	libexo libmenu libutil panel</programlisting>
 
-    <programlisting>USE_XFCE=	mcsmanager configenv</programlisting>
+      <para>However, <application>Xfce</application> components and
+	non-<application>Xfce</application> dependencies of the port
+	must be included explicitly.  Do not count on an
+	<application>Xfce</application> component to provide a
+	sub-dependency other than itself for the main port.</para>
+    </tip>
   </sect1>
 
   <sect1 xml:id="using-mozilla">
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
@@ -1378,9 +1378,16 @@
 
 	  <entry>(none), <literal>gtk3</literal></entry>
 
-	  <entry>Provide support for <application>Xfce</application>
-	    related ports.  See <xref linkend="using-xfce"/> for
-	    details.</entry>
+	  <entry>
+	    <para>Provide support for <application>Xfce</application>
+	      related ports.  See <xref linkend="using-xfce"/> for
+	      details.</para>
+
+	    <para>The <literal>gtk3</literal> argument specifies that
+	      the port requires <application>GTK3</application>
+	      features provided by <package
+		role="port">x11/libxfce4menu</package>.</para>
+	  </entry>
 	</row>
 
 	<row xml:id="uses-zip">