Index: BOOK/final-system/common/flex.xml
===================================================================
--- BOOK/final-system/common/flex.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ BOOK/final-system/common/flex.xml	(revision db27dccc12faf7719d314856be89b968430e74f8)
@@ -34,9 +34,4 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
-
-    <para os="a">Flex contains several known bugs. Fix these with the following
-    patch:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&flex-fixes-patch;</userinput></screen>
 
     <para os="c">The GNU autotools detects that the Flex source code has been
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ BOOK/final-system/mips-chapter.xml	(revision db27dccc12faf7719d314856be89b968430e74f8)
@@ -34,5 +34,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
Index: OK/final-system/mips/flex.xml
===================================================================
--- BOOK/final-system/mips/flex.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ 	(revision )
@@ -1,95 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <title>Flex-&flex-version;</title>
-
-  <indexterm zone="ch-system-flex">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <para os="p1">This patch updates <filename>config.guess</filename> and
-    <filename>config.sub</filename> for MIPS processors.</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&flex-mips_update-patch;</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-</sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(id('contents-flex'))"/>
-
-</sect1>
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ BOOK/final-system/mips64-64-chapter.xml	(revision db27dccc12faf7719d314856be89b968430e74f8)
@@ -34,5 +34,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
Index: OK/final-system/mips64-64/flex.xml
===================================================================
--- BOOK/final-system/mips64-64/flex.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <title>Flex-&flex-version;</title>
-
-  <indexterm zone="ch-system-flex">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <para os="ba">This patch updates <filename>config.guess</filename> and
-    <filename>config.sub</filename> for MIPS processors.</para>
-
-<screen os="bb"><userinput>patch -Np1 -i ../&flex-mips_update-patch;</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-</sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(id('contents-flex'))"/>
-
-</sect1>
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ BOOK/final-system/mips64-chapter.xml	(revision db27dccc12faf7719d314856be89b968430e74f8)
@@ -42,7 +42,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/flex-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/flex-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-n32.xml"/>
Index: OK/final-system/mips64/flex-64bit.xml
===================================================================
--- BOOK/final-system/mips64/flex-64bit.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ 	(revision )
@@ -1,98 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex" role="wrap">
-  <?dbhtml filename="flex-64bit.html"?>
-
-  <title>Flex-&flex-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-flex">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/flex-64bit.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/flex-64bit.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/flex-64bit.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(id('contents-flex'))"/>
-
-</sect1>
Index: OK/final-system/mips64/flex-n32.xml
===================================================================
--- BOOK/final-system/mips64/flex-n32.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex-n32" role="wrap">
-  <?dbhtml filename="flex-n32.html"?>
-
-  <title>Flex-&flex-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-flex-n32">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
-   --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <para os="l">There are some packages that expect to find the
-    <filename class="libraryfile">lex</filename> library in <filename
-    class="directory">/usr/lib32</filename>. Create a symlink to account for
-    this:</para>
-
-<screen os="m"><userinput>ln -sv libfl.a /usr/lib32/libl.a</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-flex" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/mips64/flex.xml
===================================================================
--- BOOK/final-system/mips64/flex.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex-32" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <title>Flex-&flex-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-flex-32">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/flex.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/flex.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/flex.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-flex" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/multilib/flex-64bit.xml
===================================================================
--- BOOK/final-system/multilib/flex-64bit.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ BOOK/final-system/multilib/flex-64bit.xml	(revision db27dccc12faf7719d314856be89b968430e74f8)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/flex-n32.xml
===================================================================
--- BOOK/final-system/multilib/flex-n32.xml	(revision db27dccc12faf7719d314856be89b968430e74f8)
+++ BOOK/final-system/multilib/flex-n32.xml	(revision db27dccc12faf7719d314856be89b968430e74f8)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-flex-n32" role="wrap">
+  <?dbhtml filename="flex-n32.html"?>
+
+  <title>Flex-&flex-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-flex-n32">
+    <primary sortas="a-Flex">Flex</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/flex.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Flex</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+   --libdir=/usr/lib32</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="flex.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <para os="l">There are some packages that expect to find the
+    <filename class="libraryfile">lex</filename> library in <filename
+    class="directory">/usr/lib32</filename>. Create a symlink to account for
+    this:</para>
+
+<screen os="m"><userinput>ln -sv libfl.a /usr/lib32/libl.a</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-flex" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/flex.xml
===================================================================
--- BOOK/final-system/multilib/flex.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ BOOK/final-system/multilib/flex.xml	(revision db27dccc12faf7719d314856be89b968430e74f8)
@@ -22,12 +22,4 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ BOOK/introduction/common/changelog.xml	(revision db27dccc12faf7719d314856be89b968430e74f8)
@@ -46,4 +46,7 @@
           <para>[jim] - Updated to Psmisc 22.2.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Updated to Flex 2.5.33.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ BOOK/materials/common/patches.xml	(revision db27dccc12faf7719d314856be89b968430e74f8)
@@ -19,5 +19,5 @@
   <variablelist role="materials">
 
-    <varlistentry os="p1">
+    <varlistentry>
       <term>Bash Fixes Patch - 15 KB:</term>
       <listitem>
@@ -27,5 +27,5 @@
     </varlistentry>
 
-    <varlistentry os="p2">
+    <varlistentry>
       <term>Binutils Posix Patch - 4.9 KB:</term>
       <listitem>
@@ -35,5 +35,5 @@
     </varlistentry>
 
-    <varlistentry os="p3">
+    <varlistentry>
       <term>Bzip2 Bzgrep Security Fixes Patch - 1.3 KB:</term>
       <listitem>
@@ -51,5 +51,5 @@
     </varlistentry>
 
-    <varlistentry os="p4">
+    <varlistentry>
       <term>Bzip2 Documentation Patch - 1.7 KB:</term>
       <listitem>
@@ -59,5 +59,5 @@
     </varlistentry>
 
-    <varlistentry os="p5">
+    <varlistentry>
       <term>Coreutils Suppress Uptime, Kill, Su Patch - 13 KB:</term>
       <listitem>
@@ -67,5 +67,5 @@
     </varlistentry>
 
-    <varlistentry os="p6">
+    <varlistentry>
       <term>Expect Spawn Patch - 6.9 KB:</term>
       <listitem>
@@ -75,13 +75,5 @@
     </varlistentry>
 
-    <varlistentry os="p7">
-      <term>Flex Brokenness Patch - 157 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;flex/&flex-fixes-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="p8">
+    <varlistentry>
       <term>Gawk Segfault Patch - 1.3 KB:</term>
       <listitem>
@@ -91,5 +83,5 @@
     </varlistentry>
 
-    <varlistentry os="p9">
+    <varlistentry>
       <term>GCC Cross Search Paths Patch - 2 KB:</term>
       <listitem>
@@ -99,5 +91,5 @@
     </varlistentry>
 
-    <varlistentry os="p10">
+    <varlistentry>
       <term>GCC Posix Patch - 8.6 KB:</term>
       <listitem>
@@ -107,5 +99,5 @@
     </varlistentry>
 
-    <varlistentry os="p11">
+    <varlistentry>
       <term>Glibc Disable linking with libgcc_eh.a - 1 KB:</term>
       <listitem>
@@ -115,5 +107,5 @@
     </varlistentry>
 
-    <varlistentry os="p12">
+    <varlistentry>
       <term>Glibc Localedef Segfault - 1.9 KB:</term>
       <listitem>
@@ -123,5 +115,5 @@
     </varlistentry>
 
-    <varlistentry os="p13">
+    <varlistentry>
       <term>Gzip Security Fix Patch - 2 KB:</term>
       <listitem>
@@ -131,5 +123,5 @@
     </varlistentry>
 
-    <varlistentry os="p14">
+    <varlistentry>
       <term>Inetutils GCC 4.x Fixes Patch - 1.3 KB:</term>
       <listitem>
@@ -139,5 +131,5 @@
     </varlistentry>
 
-    <varlistentry os="p15">
+    <varlistentry>
       <term>Inetutils No-Server-Man-Pages Patch - 4.1 KB:</term>
       <listitem>
@@ -147,5 +139,5 @@
     </varlistentry>
 
-    <varlistentry os="p16">
+    <varlistentry>
       <term>KBD GCC 4.x Fixes Patch - 1.5 KB:</term>
       <listitem>
@@ -155,5 +147,5 @@
     </varlistentry>
 
-    <varlistentry os="p17">
+    <varlistentry>
       <term>Mktemp Tempfile Patch - 3.6 KB:</term>
       <listitem>
@@ -163,5 +155,5 @@
     </varlistentry>
 
-    <varlistentry os="p18">
+    <varlistentry>
       <term>Perl Libc Patch - 1.1 KB:</term>
       <listitem>
@@ -171,5 +163,5 @@
     </varlistentry>
 
-    <varlistentry os="p20">
+    <varlistentry>
       <term>Readline Fixes Patch - 2.1 KB:</term>
       <listitem>
@@ -179,5 +171,5 @@
     </varlistentry>
 
-    <varlistentry os="p21">
+    <varlistentry>
       <term>Sysklogd Fixes Patch - 28 KB:</term>
       <listitem>
@@ -187,5 +179,5 @@
     </varlistentry>
 
-    <varlistentry os="p22">
+    <varlistentry>
       <term>Tar GCC-4.x Fix Patch - 1.2 KB:</term>
       <listitem>
@@ -195,5 +187,5 @@
     </varlistentry>
 
-    <varlistentry os="p23">
+    <varlistentry>
       <term>Tar Sparse Fix Patch - 1 KB:</term>
       <listitem>
@@ -203,5 +195,5 @@
     </varlistentry>
 
-    <varlistentry os="p24">
+    <varlistentry>
        <term>Texinfo Tempfile Fix Patch - 2.2 KB:</term>
        <listitem>
@@ -210,5 +202,5 @@
     </varlistentry>
 
-    <varlistentry os="p25">
+    <varlistentry>
       <term>Util-linux Cramfs Patch - 2.8 KB:</term> <listitem>
         <para><ulink
@@ -217,5 +209,5 @@
     </varlistentry>
 
-    <varlistentry os="p26">
+    <varlistentry>
       <term>Util-linux GCC 4.x Patch - 1 KB:</term> <listitem>
         <para><ulink
@@ -224,5 +216,5 @@
     </varlistentry>
 
-    <varlistentry os="p27">
+    <varlistentry>
       <term>Zlib fPIC Patch - 3.2 KB:</term> <listitem>
         <para><ulink
Index: BOOK/materials/mips/patches.xml
===================================================================
--- BOOK/materials/mips/patches.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ BOOK/materials/mips/patches.xml	(revision db27dccc12faf7719d314856be89b968430e74f8)
@@ -34,12 +34,4 @@
         <para><ulink
         url="&patches-root;file/&file-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="flex-mips_update-patch">
-      <term>Flex Config Update Patch - 33 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;flex/&flex-mips_update-patch;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/mips64-64/patches.xml
===================================================================
--- BOOK/materials/mips64-64/patches.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ BOOK/materials/mips64-64/patches.xml	(revision db27dccc12faf7719d314856be89b968430e74f8)
@@ -28,8 +28,4 @@
     href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='file-mips_update-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='flex-mips_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/materials/mips64/patches.xml
===================================================================
--- BOOK/materials/mips64/patches.xml	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ BOOK/materials/mips64/patches.xml	(revision db27dccc12faf7719d314856be89b968430e74f8)
@@ -35,8 +35,4 @@
     href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='file-mips_update-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='flex-mips_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ BOOK/packages.ent	(revision db27dccc12faf7719d314856be89b968430e74f8)
@@ -86,6 +86,6 @@
 <!ENTITY findutils-url "&gnu;findutils/findutils-&findutils-version;.tar.gz">
 
-<!ENTITY flex-version "2.5.31">
-<!ENTITY flex-size "666 KB">
+<!ENTITY flex-version "2.5.33">
+<!ENTITY flex-size "680 KB">
 <!ENTITY flex-url "&sourceforge;flex/flex-&flex-version;.tar.bz2?download">
 
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 632d284a3ab515397e443cfaa9b2dd7e34624fb0)
+++ BOOK/patches.ent	(revision db27dccc12faf7719d314856be89b968430e74f8)
@@ -13,6 +13,4 @@
 
 <!ENTITY expect-spawn-patch "expect-&expect-version;-spawn-2.patch">
-
-<!ENTITY flex-fixes-patch "flex-&flex-version;-debian_fixes-3.patch">
 
 <!ENTITY gawk-segfault-patch "gawk-&gawk-version;-segfault_fix-1.patch">
