diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index 5dafb825b0..30931e9c8c 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -199,8 +199,7 @@ WWW: http://www.oneko.org/</programlisting>
 	  is also called the <quote>packing list</quote> because the
 	  package is generated by packing the files listed here.  The
 	  pathnames are relative to the installation prefix (usually
-	  <filename>/usr/local</filename> or
-	  <filename>/usr/X11R6</filename>).  If you are using the
+	  <filename>/usr/local</filename>.  If you are using the
 	  <makevar>MAN<replaceable>n</replaceable></makevar> variables
 	  (as you should be), do not list any manpages here.  If the
 	  port creates directories during installation, make sure to
@@ -596,7 +595,7 @@ PLIST_DIRS=	lib/X11/oneko</programlisting>
       <para>Get the original sources (normally) as a compressed
 	tarball
 	(<filename><replaceable>foo</replaceable>.tar.gz</filename> or
-	<filename><replaceable>foo</replaceable>.tar.Z</filename>) and
+	<filename><replaceable>foo</replaceable>.tar.bz2</filename>) and
 	copy it into <makevar>DISTDIR</makevar>.  Always use
 	<emphasis>mainstream</emphasis> sources when and where you
 	can.</para>
@@ -857,10 +856,7 @@ DOS2UNIX_REGEX=	.*\.(c|cpp|h)</programlisting>
 	<makevar>EXTRACT_AFTER_ARGS</makevar>,
 	<makevar>EXTRACT_SUFX</makevar>, or
 	<makevar>DISTFILES</makevar> variables, depending on how alien
-	a format your port's distribution file is.  (The most common
-	case is <literal>EXTRACT_SUFX=.tar.Z</literal>, when the
-	tarball is condensed by regular <command>compress</command>,
-	not <command>gzip</command>.)</para>
+	a format your port's distribution file is.</para>
 
       <para>In the worst case, you can simply create your own
 	<maketarget>do-extract</maketarget> target to override the
@@ -2547,13 +2543,14 @@ MASTER_SITE_SUBDIR=	make</programlisting>
 	<programlisting>DISTNAME=	foo
 EXTRACT_SUFX=	.tgz</programlisting>
 
-	<para>The <makevar>USE_BZIP2</makevar> and
+	<para>The <makevar>USE_BZIP2</makevar>,
+	  <makevar>USE_XZ</makevar> and
 	  <makevar>USE_ZIP</makevar> variables automatically set
 	  <makevar>EXTRACT_SUFX</makevar> to
-	  <literal>.tar.bz2</literal> or <literal>.zip</literal> as
-	  necessary.  If neither of these are set then
-	  <makevar>EXTRACT_SUFX</makevar> defaults to
-	  <literal>.tar.gz</literal>.</para>
+	  <literal>.tar.bz2</literal>, <literal>.tar.xz</literal>
+	  or <literal>.zip</literal> as necessary.  If neither of
+	  these are set then <makevar>EXTRACT_SUFX</makevar>
+	  defaults to <literal>.tar.gz</literal>.</para>
 
 	<note>
 	  <para>You never need to set both
@@ -3526,7 +3523,7 @@ ALWAYS_KEEP_DISTFILES=	yes
 	  <para>The official search <envar>PATH</envar> used on the
 	    ports build cluster is</para>
 
-	  <programlisting>/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin</programlisting>
+	  <programlisting>/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin</programlisting>
 	</note>
 
 	<para>The dependency is checked from within the
@@ -5630,19 +5627,18 @@ PLIST_SUB+=		NLS="@comment "
 	  are:</para>
 
 	<para><literal>bigreqsproto compositeproto damageproto dmx
-	    dmxproto evieproto fixesproto fontcacheproto fontenc
-	    fontsproto fontutil glproto ice inputproto kbproto libfs
-	    oldx printproto randrproto recordproto renderproto
-	    resourceproto scrnsaverproto sm trapproto videoproto x11
-	    xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite
-	    xcursor xdamage xdmcp xevie xext xextproto
-	    xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto
-	    xf86rushproto xf86vidmodeproto xfixes xfont xfontcache xft
-	    xi xinerama xineramaproto xkbfile xkbui xmu xmuu
-	    xorg-server xp xpm xprintapputil xprintutil xpr oto
-	    xproxymngproto xrandr xrender xres xscrnsaver xt xtrans
-	    xtrap xtst xv xvmc xxf86dga xxf86misc
-	    xxf86vm</literal>.</para>
+	    dmxproto dri2proto evieproto fixesproto fontcacheproto
+	    fontenc fontsproto fontutil glproto ice inputproto kbproto
+	    libfs oldx pciaccess pixman printproto randrproto
+	    recordproto renderproto resourceproto scrnsaverproto sm
+	    trapproto videoproto x11 xau xaw xaw6 xaw7 xbitmaps
+	    xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext
+	    xextproto xf86bigfontproto xf86dgaproto xf86driproto
+	    xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont
+	    xfontcache xft xi xinerama xineramaproto xkbfile xkbui
+	    xmu xmuu xorg-server xp xpm xprintapputil xprintutil
+	    xproto xproxymngproto xrandr xrender xres xscrnsaver xt
+	    xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm</literal>.</para>
 
 	<para>Always up-to-date list can be found in
 	  <filename>/usr/ports/Mk/bsd.xorg.mk</filename>.</para>
@@ -5662,7 +5658,7 @@ PLIST_SUB+=		NLS="@comment "
 USE_GL=		glu</programlisting>
 	</example>
 
-	<para>Many ports define <makevar>USE_XLIB</makevar>, which
+	<para>Some ports define <makevar>USE_XLIB</makevar>, which
 	  makes the port depend on all the 50 or so libraries.  This
 	  variable exists for backwards compatibility, as it predates
 	  modular X.Org, and should not be used on new ports.</para>
@@ -5685,13 +5681,6 @@ USE_GL=		glu</programlisting>
 		<entry>The port uses <command>imake</command>.</entry>
 	      </row>
 
-	      <row>
-		<entry><makevar>USE_X_PREFIX</makevar></entry>
-		<entry>Deprecated.  Today it is equivalent to
-		  <makevar>USE_XLIB</makevar> and can be replaced by
-		  it freely.</entry>
-	      </row>
-
 	      <row>
 		<entry><makevar>XMKMF</makevar></entry>
 		<entry>Set to the path of <command>xmkmf</command> if
@@ -5847,8 +5836,8 @@ USE_XORG=	x11 xpm</programlisting>
 	</itemizedlist>
 
 	<para>Note that <makevar>MOTIFLIB</makevar> (usually) expands
-	  to <literal>-L/usr/X11R6/lib -lXm</literal> or
-	  <literal>/usr/X11R6/lib/libXm.a</literal>, so there is no
+	  to <literal>-L/usr/local/lib -lXm</literal> or
+	  <literal>/usr/local/lib/libXm.a</literal>, so there is no
 	  need to add <literal>-L</literal> or <literal>-l</literal>
 	  in front.</para>
       </sect2>
@@ -7026,7 +7015,7 @@ QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build</programlisting>
 		<entry><makevar>DEFAULT_PHP_VER</makevar></entry>
 		<entry>Selects which major version of PHP will be
 		  installed as a dependency when no PHP is installed
-		  yet.  Default is <literal>4</literal>.  Possible
+		  yet.  Default is <literal>5</literal>.  Possible
 		  values: <literal>4</literal>,
 		  <literal>5</literal></entry>
 	      </row>
@@ -7164,9 +7153,9 @@ _DOCSDIR=	.
 	      <entry><makevar>USE_PYTHON</makevar></entry>
 	      <entry>The port needs Python.  Minimal required version
 		can be specified with values such as
-		<literal>2.3+</literal>.  Version ranges can also be
+		<literal>2.6+</literal>.  Version ranges can also be
 		specified, by separating two version numbers with a
-		dash, e.g.: <literal>2.1-2.3</literal></entry>
+		dash, e.g.: <literal>2.6-2.7</literal></entry>
 	    </row>
 
 	    <row>
@@ -7243,7 +7232,7 @@ _DOCSDIR=	.
 	    <row>
 	      <entry><makevar>USE_ZOPE</makevar></entry>
 	      <entry>Add dependency on Zope, a web application
-		platform.  Change Python dependency to Python 2.3.
+		platform.  Change Python dependency to Python 2.7.
 		Set <makevar>ZOPEBASEDIR</makevar> containing a
 		directory with Zope installation.</entry>
 	    </row>
@@ -8928,6 +8917,14 @@ CFLAGS+=	-DLUA_VERSION_STRING="${VER_STR}"
 		<literal> 90+</literal> will cause the
 		port to depend on a minimum version of 9.0.</entry>
 	    </row>
+
+	    <row>
+	      <entry><makevar>USE_SQLITE</makevar></entry>
+	      <entry>If variable is set to <literal>yes</literal>, add
+		dependency on <filename
+		role="package">databases/sqlite3</filename>
+		port.  The variable may also be set to values: 3, 2.</entry>
+	    </row>
 	  </tbody>
 	</tgroup>
       </table>
@@ -9630,10 +9627,7 @@ etc/orbit.conf.sample
 	<makevar>ECHO_MSG</makevar> and <makevar>ECHO_CMD</makevar>
 	should be kept in mind.  The former is for printing
 	informational text to the screen, while the latter is for
-	command pipelining.</para>
-
-      <para>A good example for both can be found in
-	<filename>shells/bash2/Makefile</filename>:</para>
+	command pipelining:</para>
 
       <programlisting>update-etc-shells:
 	@${ECHO_MSG} "updating /etc/shells"
@@ -15385,15 +15379,6 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 		  linkend="freebsd-versions"><literal>__FreeBSD_version</literal></link>.</entry>
 	    </row>
 
-	    <row>
-	      <entry><makevar>PORTOBJFORMAT</makevar></entry>
-	      <entry>The object format of the system
-		(<literal>elf</literal> or <literal>aout</literal>;
-		note that for <quote>modern</quote> versions of
-		FreeBSD, <literal>aout</literal> is
-		deprecated.)</entry>
-	    </row>
-
 	    <row>
 	      <entry><makevar>LOCALBASE</makevar></entry>
 	      <entry>The base of the <quote>local</quote> tree (e.g.,
@@ -15412,8 +15397,7 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
 
       <note>
 	<para>If you have to define the variables
-	  <makevar>USE_IMAKE</makevar>,
-	  <makevar>USE_X_PREFIX</makevar>, or
+	  <makevar>USE_IMAKE</makevar> or
 	  <makevar>MASTERDIR</makevar>, do so before including
 	  <filename>bsd.port.pre.mk</filename>.</para>
       </note>
@@ -15765,7 +15749,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting>
 
 	    <programlisting>ONLY_FOR_ARCHS=	i386 amd64</programlisting>
 
-	    <programlisting>NOT_FOR_ARCHS=	alpha ia64 sparc64</programlisting>
+	    <programlisting>NOT_FOR_ARCHS=	ia64 sparc64</programlisting>
 
 	    <para>A custom <makevar>IGNORE</makevar> message can be
 	      set using <makevar>ONLY_FOR_ARCHS_REASON</makevar> and