Index: general.ent
===================================================================
--- general.ent	(revision 374ac5a741caf48a7e539db40b06609080ce6912)
+++ general.ent	(revision 0ea00d5e7423ff69dbf638510d80ae39e3bbfa56)
@@ -285,5 +285,5 @@
 <!ENTITY popt-version                 "1.16">
 <!ENTITY pth-version                  "2.0.7">
-<!ENTITY ptlib-version                "2.10.7">
+<!ENTITY ptlib-version                "2.10.9">
 <!ENTITY qca-version                  "2.0.3">
 <!ENTITY slib-version                 "3b3">
@@ -859,5 +859,5 @@
 <!ENTITY libvorbis-version            "1.3.3">
 <!ENTITY libvpx-version               "1.1.0">
-<!ENTITY opal-version                 "3.10.7">
+<!ENTITY opal-version                 "3.10.9">
 <!ENTITY pulseaudio-version           "2.1">
 <!ENTITY sdl-version                  "1.2.15">
Index: general/genlib/ptlib.xml
===================================================================
--- general/genlib/ptlib.xml	(revision 374ac5a741caf48a7e539db40b06609080ce6912)
+++ general/genlib/ptlib.xml	(revision 0ea00d5e7423ff69dbf638510d80ae39e3bbfa56)
@@ -7,11 +7,11 @@
   <!ENTITY ptlib-download-http "&gnome-download-http;/ptlib/2.10/ptlib-&ptlib-version;.tar.xz">
   <!ENTITY ptlib-download-ftp  "&gnome-download-ftp;/ptlib/2.10/ptlib-&ptlib-version;.tar.xz">
-  <!ENTITY ptlib-md5sum        "5f1a5eb56fed55e13d1aecf2b4ff165a">
-  <!ENTITY ptlib-size          "2.3 MB">
-  <!ENTITY ptlib-buildsize     "80 MB">
+  <!ENTITY ptlib-md5sum        "460e63b0d168c7f4b670b2561a219c6b">
+  <!ENTITY ptlib-size          "2.5 MB">
+  <!ENTITY ptlib-buildsize     "105 MB">
   <!ENTITY ptlib-time          "1.0 SBU">
 ]>
 
-<sect1 id="ptlib" xreflabel="ptlib-&ptlib-version;">
+<sect1 id="ptlib" xreflabel="Ptlib-&ptlib-version;">
   <?dbhtml filename="ptlib.html"?>
 
@@ -21,17 +21,19 @@
   </sect1info>
 
-  <title>ptlib-&ptlib-version;</title>
+  <title>Ptlib-&ptlib-version;</title>
 
   <indexterm zone="ptlib">
-    <primary sortas="a-ptlib">ptlib</primary>
+    <primary sortas="a-Ptlib">Ptlib</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to ptlib</title>
+    <title>Introduction to Ptlib</title>
 
-    <para>The <application>ptlib</application> (Portable Tools Library) package
-    is a class library that has its genesis many years ago as PWLib (portable
-    Windows Library), a method to produce applications to run on various
-    platforms.</para>
+    <para>
+      The <application>Ptlib</application> (Portable Tools Library) package
+      contains a class library that has its genesis many years ago as PWLib
+      (portable Windows Library), a method to produce applications to run on
+      various platforms.
+    </para>
 
     &lfs72_checked;
@@ -40,67 +42,87 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&ptlib-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&ptlib-download-http;"/>
+         </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&ptlib-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&ptlib-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &ptlib-md5sum;</para>
+        <para>
+          Download MD5 sum: &ptlib-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &ptlib-size;</para>
+        <para>
+          Download size: &ptlib-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &ptlib-buildsize;</para>
+        <para>
+          Estimated disk space required: &ptlib-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &ptlib-time;</para>
+        <para>
+          Estimated build time: &ptlib-time;
+        </para>
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">ptlib Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Ptlib Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="pkgconfig"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="expat"/> and
+      <xref linkend="openssl"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="alsa-lib"/>,
-    <xref linkend="cyrus-sasl"/>
-    <xref linkend="expat"/>
-    <ulink url="http://sourceforge.net/projects/libavc1394/">libavc1394</ulink>,
-    <xref linkend="libdv"/>,
-    <ulink url="http://www.linux1394.org/">libraw1394</ulink>,
-    <xref linkend="openldap"/>,
-    <xref linkend="openssl"/>,
-    <xref linkend="sdl"/>, and
-    <xref linkend="speex"/></para>
+    <para role="optional">
+      <xref linkend="cyrus-sasl"/>,
+      <ulink url="http://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
+      <ulink url="http://www.linux1394.org/">libraw1394</ulink>,
+      <ulink url="http://www.lua.org/">Lua</ulink>,
+      <xref linkend="openldap"/>,
+      <xref linkend="pulseaudio"/>,
+      <xref linkend="sdl"/>,
+      <xref linkend="unixodbc"/> and
+      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/ptlib"/></para>
-
+      <ulink url="&blfs-wiki;/ptlib"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of ptlib</title>
+    <title>Installation of Ptlib</title>
 
-    <para>Install <application>ptlib</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>Ptlib</application> by running the following
+      commands:
+    </para>
 
-<screen><userinput>sed -i -e 's:typedef.*int32.*[SU]DWORD://&amp;:' \
-    include/ptlib/unix/ptlib/contain.h &amp;&amp;
-
-./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed ... contain.h</command>: This command removes a conflict with
-    the installed include file <filename>/usr/include/sqltypes.h</filename>.</para>
 
   </sect2>
@@ -110,14 +132,21 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libpt.so, libpt_s.a, alsa_pwplugin.so, and v4l2_pwplugin.so</seg>
-        <seg>/usr/{include/{ptclib,ptlib/unix/ptlib},
-        lib/ptlib-&ptlib-version;/devices/{sound,videoinput},
-        share/ptlib/make}</seg>
+        <seg>
+          ptlib-config
+        </seg>
+        <seg>
+          libpt.so and libpt_s.a
+        </seg>
+        <seg>
+          /usr/include/ptclib,
+          /usr/include/ptlib,
+          /usr/lib/ptlib-&ptlib-version; and
+          /usr/share/ptlib
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -129,9 +158,11 @@
 
       <varlistentry id="libpt">
-        <term><filename class='libraryfile'>libpt{.so,_s.a}</filename></term>
+        <term><filename class="libraryfile">libpt.so</filename></term>
         <listitem>
-          <para>contains the <application>ptlib</application> API methods.</para>
+          <para>
+            contains the <application>Ptlib</application> API functions.
+          </para>
           <indexterm zone="ptlib libpt">
-            <primary sortas="c-libpt">libpt{.so,_s.a}</primary>
+            <primary sortas="c-libpt">libpt.so</primary>
           </indexterm>
         </listitem>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 374ac5a741caf48a7e539db40b06609080ce6912)
+++ introduction/welcome/changelog.xml	(revision 0ea00d5e7423ff69dbf638510d80ae39e3bbfa56)
@@ -45,10 +45,12 @@
 -->
     <listitem>
-      <para>November 27rd, 2012</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Updated text to reflect that Fluxbox
-          no longer needs Which, except for one specific case.</para>
-        </listitem>
+      <para>November 27th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>Ptlib 2.10.9.</para>
+        </listitem>
+        <listitem>  
+          <para>Opal 3.10.9.</para>
+        </listitem>  
       </itemizedlist>
     </listitem>
Index: multimedia/libdriv/opal.xml
===================================================================
--- multimedia/libdriv/opal.xml	(revision 374ac5a741caf48a7e539db40b06609080ce6912)
+++ multimedia/libdriv/opal.xml	(revision 0ea00d5e7423ff69dbf638510d80ae39e3bbfa56)
@@ -7,11 +7,11 @@
   <!ENTITY opal-download-http "&gnome-download-http;/opal/3.10/opal-&opal-version;.tar.xz">
   <!ENTITY opal-download-ftp  "&gnome-download-ftp;/opal/3.10/opal-&opal-version;.tar.xz">
-  <!ENTITY opal-md5sum        "6bf7156ff212fcd5835416f297bd4a4f">
-  <!ENTITY opal-size          "5.5 MB">
-  <!ENTITY opal-buildsize     "227 MB">
-  <!ENTITY opal-time          "2.1 SBU">
+  <!ENTITY opal-md5sum        "bb8eeb28321035663738e4fc8d6eb852">
+  <!ENTITY opal-size          "5.7 MB">
+  <!ENTITY opal-buildsize     "305 MB">
+  <!ENTITY opal-time          "2.0 SBU">
 ]>
 
-<sect1 id="opal" xreflabel="opal-&opal-version;">
+<sect1 id="opal" xreflabel="Opal-&opal-version;">
   <?dbhtml filename="opal.html"?>
 
@@ -21,16 +21,18 @@
   </sect1info>
 
-  <title>opal-&opal-version;</title>
+  <title>Opal-&opal-version;</title>
 
   <indexterm zone="opal">
-    <primary sortas="a-opal">opal</primary>
+    <primary sortas="a-Opal">Opal</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to opal</title>
+    <title>Introduction to Opal</title>
 
-    <para>The <application>opal</application> package is a C++ class library for
-    normalising the numerous telephony protocols into a single integrated call
-    model.</para>
+    <para>
+      The <application>Opal</application> package contains a C++ class library for
+      normalising the numerous telephony protocols into a single integrated call
+      model.
+    </para>
 
     &lfs72_checked;
@@ -39,52 +41,73 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&opal-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&opal-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&opal-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&opal-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &opal-md5sum;</para>
+        <para>
+          Download MD5 sum: &opal-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &opal-size;</para>
+        <para>
+          Download size: &opal-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &opal-buildsize;</para>
+        <para>
+          Estimated disk space required: &opal-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &opal-time;</para>
+        <para>
+          Estimated build time: &opal-time;
+        </para>
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Download</bridgehead>
-    <itemizedlist spacing='compact'>
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
       <listitem>
-        <para>Required Patch: <ulink
-        url="&patch-root;/opal-&opal-version;-ffmpeg-1.patch"/></para>
+        <para>
+          Required Patch:
+          <ulink url="&patch-root;/opal-&opal-version;-ffmpeg-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">opal Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Opal Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="ptlib"/></para>
+    <para role="required">
+      <xref linkend="ptlib"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink url="http://www.celt-codec.org/">celt</ulink>,
-    <xref linkend="ffmpeg"/>,
-    <xref linkend="libtheora"/>,
-    <xref linkend="speex"/>, and
-    <ulink url="http://www.videolan.org/developers/x264.html">x264</ulink></para>
+    <para role="optional">
+      <ulink url="http://www.celt-codec.org/">Celt</ulink>,
+      <xref linkend="ffmpeg"/>,
+      <ulink url="http://www.quut.com/gsm/">GSM</ulink>,
+      <ulink url="http://www.isdn4linux.de/">ISDN4Linux</ulink>,
+      <xref linkend="libtheora"/>,
+      <ulink url="www.soft-switch.org/">Spandsp</ulink>,
+      <xref linkend="speex"/> and
+      <ulink url="http://www.videolan.org/developers/x264.html">x264</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/opal"/></para>
-
+      <ulink url="&blfs-wiki;/opal"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of opal</title>
+    <title>Installation of Opal</title>
 
-    <para>Install <application>opal</application> by running the following
+    <para>Install <application>Opal</application> by running the following
     commands:</para>
 
@@ -93,17 +116,13 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>patch -Np1 -i ...</command>: The patch allows opal to build
-    with recent releases of <application>ffmpeg</application>.</para>
 
   </sect2>
@@ -113,18 +132,15 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libopal.so, libopal_s.a, g722_audio_pwplugin.so,
-        g726_audio_pwplugin.so, gsm0610_audio_pwplugin.so,
-        gsmamrcodec_pwplugin.so, ilbc_audio_pwplugin.so,
-        ima_adpcm_audio_pwplugin.so, lpc10_audio_pwplugin.so,
-        speex_audio_pwplugin.so, h261-vic_video_pwplugin.so, and
-        vpb_lid_pwplugin.so</seg>
-        <seg>/usr/{include/opal/{asn,codec,h323,h460,iax2,im,lids,opal,rtp,sip,
-        t120,t38,zrtp},lib/opal-3.6.8/{codecs/{audio,video},lid}}</seg>
+        <seg>
+          libopal.so and libopal_s.a
+        </seg>
+        <seg>
+          /usr/include/opal and
+          /usr/lib/opal-&opal-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -136,8 +152,9 @@
 
       <varlistentry id="libopal">
-        <term><filename class='libraryfile'>libopal.so</filename></term>
+        <term><filename class="libraryfile">libopal.so</filename></term>
         <listitem>
-          <para>contains the <application>opal</application> API
-          functions.</para>
+          <para>
+            contains the <application>Opal</application> API functions.
+          </para>
           <indexterm zone="opal libopal">
             <primary sortas="c-libopal">libopal.so</primary>
