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
@@ -2538,10 +2538,10 @@
 
       <para>The Ports Collection provides support for Qt 4 and Qt 5
 	frameworks with
-	<varname>USE_QT<replaceable>x</replaceable></varname>,
+	<varname>USES=qt:<replaceable>x</replaceable></varname>,
 	where <replaceable>x</replaceable> is
 	<literal>4</literal> or <literal>5</literal>.
-	Set <varname>USE_QT<replaceable>x</replaceable></varname>
+	Set <varname>USE_QT</varname>
 	to the list of required Qt components (libraries,
 	tools, plugins).  The Qt 4 and Qt 5 frameworks are quite
 	similar.  The main difference is the set of supported
@@ -2556,12 +2556,6 @@
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><varname>QT_PREFIX</varname></entry>
-	      <entry>Set to the path where Qt was installed
-		(<literal>&dollar;{LOCALBASE}</literal>).</entry>
-	    </row>
-
-	    <row>
 	      <entry><varname>QMAKE</varname></entry>
 	      <entry>Full path to <command>qmake</command>
 		binary.</entry>
@@ -2633,7 +2627,7 @@
 
       <para>Individual Qt tool and library dependencies must be
 	specified in
-	<varname>USE_QT<replaceable>x</replaceable></varname>.
+	<varname>USE_QT</varname>.
 	Every component can be suffixed with
 	<literal>_build</literal> or <literal>_run</literal>, the
 	suffix indicating whether the dependency on the component is
@@ -2825,7 +2819,8 @@
 	  only needed at buildtime, thus they are specified with the
 	  <literal>_build</literal> suffix:</para>
 
-	<programlisting>USE_QT4=	gui moc_build qmake_build rcc_build uic_build</programlisting>
+	  <programlisting>USES=	  qt:4
+USE_QT=	  gui moc_build qmake_build rcc_build uic_build</programlisting>
       </example>
     </sect2>
 
@@ -2837,11 +2832,11 @@
 	<application>qmake</application> project file
 	(<filename>*.pro</filename>), define
 	<literal>USES= qmake</literal> along with
-	<literal>USE_QT<replaceable>x</replaceable></literal>.  Note
+	<literal>USE_QT</literal>.  Note
 	that <literal>USES= qmake</literal> already implies a build
 	dependency on qmake, therefore the qmake component can be
 	omitted from
-	<literal>USE_QT<replaceable>x</replaceable></literal>.
+	<literal>USE_QT</literal>.
 	Similar to <link
 	  linkend="using-cmake"><application>CMake</application></link>,
 	<application>qmake</application> supports out-of-source
@@ -2896,13 +2891,21 @@
 	<para>This snippet demonstrates the use of
 	  <application>qmake</application> for a Qt 4 port:</para>
 
-	<programlisting>USES=		qmake:outsource
-USE_QT4=	moc_build</programlisting>
+	<programlisting>USES=		qmake:outsource qt:4
+USE_QT=		moc_build</programlisting>
 
 	<para>For a Qt 5 port:</para>
-	<programlisting>USES=		qmake:outsource
-USE_QT5=	buildtools_build</programlisting>
+	<programlisting>USES=		qmake:outsource qt:5
+USE_QT=		buildtools_build</programlisting>
       </example>
+
+      <tip>
+	    <para>It is also possible to specify the Qt version as an argument to <varname>qmake</varname>. 
+	      So for example one could write
+	      <programlisting>USES=		qmake:5,outsource</programlisting>
+	      For clarity it is recommended for ports that use <command>qmake</command> for configuration, 
+	      but do not list any components via <varname>USE_QT</varname></para>
+      </tip>
 
       <para>Qt applications are often written to be cross-platform
 	and often X11/Unix is not the platform they are developed