Index: general.ent
===================================================================
--- general.ent	(revision 13d0d6f091ceee26a9341badadf169baa1c0f852)
+++ general.ent	(revision 10f9bb4557a71277b9d20b13db4f6decd1a353a6)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "30">                   <!-- Always 2 digits -->
+<!ENTITY day          "31">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "December 30th &year;">
+<!ENTITY releasedate  "December 31st &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/genlib/gobject-introspection.xml
===================================================================
--- general/genlib/gobject-introspection.xml	(revision 13d0d6f091ceee26a9341badadf169baa1c0f852)
+++ general/genlib/gobject-introspection.xml	(revision 10f9bb4557a71277b9d20b13db4f6decd1a353a6)
@@ -76,5 +76,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/>
+      <xref linkend="glib2"/> and
+      <xref linkend="python2"/>
     </para>
 
Index: general/genutils/iso-codes.xml
===================================================================
--- general/genutils/iso-codes.xml	(revision 13d0d6f091ceee26a9341badadf169baa1c0f852)
+++ general/genutils/iso-codes.xml	(revision 10f9bb4557a71277b9d20b13db4f6decd1a353a6)
@@ -10,7 +10,7 @@
   <!ENTITY iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz">
   <!ENTITY iso-codes-download-ftp  " ">
-  <!ENTITY iso-codes-md5sum        "f16ea4bf101c226d6c8a253d39a9d23b">
-  <!ENTITY iso-codes-size          "3.6 MB">
-  <!ENTITY iso-codes-buildsize     "110 MB (with tests)">
+  <!ENTITY iso-codes-md5sum        "129f822fd64c9bf80931cccc269ccb95">
+  <!ENTITY iso-codes-size          "3.7 MB">
+  <!ENTITY iso-codes-buildsize     "111 MB (with tests)">
   <!ENTITY iso-codes-time          "0.2 SBU (with tests)">
 ]>
Index: general/genutils/unixodbc.xml
===================================================================
--- general/genutils/unixodbc.xml	(revision 13d0d6f091ceee26a9341badadf169baa1c0f852)
+++ general/genutils/unixodbc.xml	(revision 10f9bb4557a71277b9d20b13db4f6decd1a353a6)
@@ -5,9 +5,11 @@
   %general-entities;
 
-  <!ENTITY unixodbc-download-http "http://www.unixodbc.org/unixODBC-&unixodbc-version;.tar.gz">
-  <!ENTITY unixodbc-download-ftp  "&gentoo-ftp-repo;/unixODBC-&unixodbc-version;.tar.gz">
-  <!ENTITY unixodbc-md5sum        "5e4528851eda5d3d4aed249b669bd05b">
+<!--  <!ENTITY unixodbc-download-http "http://www.unixodbc.org/unixODBC-&unixodbc-version;.tar.gz">
+  <!ENTITY unixodbc-download-ftp  "&gentoo-ftp-repo;/unixODBC-&unixodbc-version;.tar.gz">-->
+  <!ENTITY unixodbc-download-http " ">
+  <!ENTITY unixodbc-download-ftp  "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-&unixodbc-version;.tar.gz">
+  <!ENTITY unixodbc-md5sum        "bd25d261ca1808c947cb687e2034be81">
   <!ENTITY unixodbc-size          "1.8 MB">
-  <!ENTITY unixodbc-buildsize     "33 MB">
+  <!ENTITY unixodbc-buildsize     "34 MB">
   <!ENTITY unixodbc-time          "0.4 SBU">
 ]>
Index: general/prog/swig.xml
===================================================================
--- general/prog/swig.xml	(revision 13d0d6f091ceee26a9341badadf169baa1c0f852)
+++ general/prog/swig.xml	(revision 10f9bb4557a71277b9d20b13db4f6decd1a353a6)
@@ -7,8 +7,8 @@
   <!ENTITY swig-download-http "&sourceforge-repo;/swig/swig-&swig-version;.tar.gz">
   <!ENTITY swig-download-ftp  " ">
-  <!ENTITY swig-md5sum        "7fff46c84b8c630ede5b0f0827e3d90a">
-  <!ENTITY swig-size          "5.7 MB">
-  <!ENTITY swig-buildsize     "88 MB (1.1 GB with tests)">
-  <!ENTITY swig-time          "0.4 SBU (6.4 SBU with tests, using -j4)">
+  <!ENTITY swig-md5sum        "c96a1d5ecb13d38604d7e92148c73c97">
+  <!ENTITY swig-size          "7.6 MB">
+  <!ENTITY swig-buildsize     "93 MB (1.1 GB with tests)">
+  <!ENTITY swig-time          "0.4 SBU (6.2 SBU for the tests, using -j4)">
 ]>
 
@@ -184,6 +184,6 @@
         </seg>
         <seg>
-          /usr/share/swig/&swig-version; and
-          /usr/share/doc/swig-&swig-version;
+          /usr/share/doc/swig-&swig-version; and
+          /usr/share/swig/&swig-version;
         </seg>
       </seglistitem>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 13d0d6f091ceee26a9341badadf169baa1c0f852)
+++ introduction/welcome/changelog.xml	(revision 10f9bb4557a71277b9d20b13db4f6decd1a353a6)
@@ -44,4 +44,26 @@
 
 -->
+
+    <listitem>
+      <para>December 31st, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to swig-3.0.8. Fixes
+          <ulink url="&blfs-ticket-root;7309">#7309</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to unixODBC-2.3.4. Fixes
+          <ulink url="&blfs-ticket-root;7308">#7308</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to iso-codes-3.63. Fixes
+          <ulink url="&blfs-ticket-root;7307">#7307</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to qemu-2.5.0. Fixes
+          <ulink url="&blfs-ticket-root;7260">#7260</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: packages.ent
===================================================================
--- packages.ent	(revision 13d0d6f091ceee26a9341badadf169baa1c0f852)
+++ packages.ent	(revision 10f9bb4557a71277b9d20b13db4f6decd1a353a6)
@@ -68,5 +68,5 @@
 
 <!-- Chapter 8 Virtualization -->
-<!ENTITY qemu-version                 "2.4.1">
+<!ENTITY qemu-version                 "2.5.0">
 
 <!-- Part III -->
@@ -99,5 +99,5 @@
 <!ENTITY icu-dl-version               "&icu-major;_&icu-minor;"><!-- _&icu-patch;-->
 
-<!ENTITY iso-codes-version            "3.59">
+<!ENTITY iso-codes-version            "3.63">
 <!ENTITY JS-version                   "17.0.0">
 <!ENTITY JS2-version                  "24.2.0">
@@ -211,5 +211,5 @@
 <!ENTITY time-version                 "1.7">
 <!ENTITY tree-version                 "1.7.0">
-<!ENTITY unixodbc-version             "2.3.2">
+<!ENTITY unixodbc-version             "2.3.4">
 
 <!-- Chapter 12 -->
@@ -283,5 +283,5 @@
 <!ENTITY slang-version                "2.2.4">
 <!ENTITY subversion-version           "1.9.3">
-<!ENTITY swig-version                 "3.0.7">
+<!ENTITY swig-version                 "3.0.8">
 <!ENTITY tcl-version                  "8.6.4">
 <!ENTITY tk-version                   "8.6.4">
Index: postlfs/virtualization/qemu.xml
===================================================================
--- postlfs/virtualization/qemu.xml	(revision 13d0d6f091ceee26a9341badadf169baa1c0f852)
+++ postlfs/virtualization/qemu.xml	(revision 10f9bb4557a71277b9d20b13db4f6decd1a353a6)
@@ -7,8 +7,8 @@
   <!ENTITY qemu-download-http "http://wiki.qemu.org/download/qemu-&qemu-version;.tar.bz2">
   <!ENTITY qemu-download-ftp  " ">
-  <!ENTITY qemu-md5sum        "a895e93ec1dafc34bc64ed676f0d55a6">
-  <!ENTITY qemu-size          "24 MB">
-  <!ENTITY qemu-buildsize     "303 MB (additional 91 MB for tests)">
-  <!ENTITY qemu-time          "1.7 SBU (additional 1.0 SBU for tests)">
+  <!ENTITY qemu-md5sum        "f469f2330bbe76e3e39db10e9ac4f8db">
+  <!ENTITY qemu-size          "25 MB">
+  <!ENTITY qemu-buildsize     "419 MB (with tests)">
+  <!ENTITY qemu-time          "2.4 SBU (with tests)">
 ]>
 
@@ -79,11 +79,16 @@
       <xref linkend="curl"/>,
       <xref linkend="cyrus-sasl"/>,
+      <xref linkend="gnutls"/>,
       <xref linkend="gtk2"/>,
       <xref linkend="gtk3"/>,
       <xref linkend="libusb"/>,
+      <xref linkend="libgcrypt"/>,
       <xref linkend="lzo"/>,
+      <xref linkend="nettle"/>,
       <xref linkend="nss"/> (for libcacard.so),
-      <xref linkend="mesa"/>, and
-      <xref linkend="vte"/>
+      <xref linkend="mesa"/>,
+      <xref linkend="sdl"/>,
+      <xref linkend="vte"/>,
+      <ulink url="http://www.libssh2.org">libssh2</ulink>
     </para>
 
@@ -152,5 +157,5 @@
 
     <note><para>Qemu is capable of running many targets.  The build process
-    is also capable of building multiple targets at one time in a 
+    is also capable of building multiple targets at one time in a
     comma delimited list assigned to <option>--target-list</option>. Run
     <command>./configure --help</command> to get a complete list of
@@ -164,7 +169,11 @@
 fi
 
-./configure --prefix=/usr            \
-            --sysconfdir=/etc        \
-            --target-list=$QEMU_ARCH \
+mkdir -vp build &amp;&amp;
+cd        build &amp;&amp;
+
+./configure --prefix=/usr               \
+            --sysconfdir=/etc           \
+            --target-list=$QEMU_ARCH    \
+            --audio-drv-list=alsa       \
             --docdir=/usr/share/doc/qemu-&qemu-version; &amp;&amp;
 unset QEMU_ARCH &amp;&amp;
@@ -213,5 +222,5 @@
     the installed program. For instance:</para>
 
-    <screen role="root"><userinput>ln -sv qemu-system-x86_64 /usr/bin/qemu</userinput></screen>
+<screen role="root"><userinput>ln -sv qemu-system-`uname -m` /usr/bin/qemu</userinput></screen>
     </note>
 
@@ -222,6 +231,6 @@
 
     <para>
-      <option>--audio-drv-list=alsa</option>: This switch sets the audio driver
-      to ALSA. For other drivers see the --audio-drv-list list in
+      <parameter>--audio-drv-list=alsa</parameter>: This switch sets the audio
+      driver to ALSA. For other drivers see the --audio-drv-list list in
       <command>configure</command>'s help output. The default audio driver is
       OSS.
@@ -243,5 +252,5 @@
     <note><para>The following instructions assume you have created the optional
     symbolic link, <userinput>qemu</userinput>.  Additionally, you must run
-    <userinput>qemu</userinput> from an X Window System based terminal 
+    <userinput>qemu</userinput> from an X Window System based terminal
     (either locally or over ssh).</para></note>
 
@@ -391,9 +400,12 @@
       <seglistitem>
         <seg>
+          ivshmem-client,
+          ivshmem-server,
+          qemu (symlink),
           qemu-ga,
           qemu-img,
           qemu-io,
           qemu-nbd,
-          qemu-system-x86_64,
+          qemu-system-&lt;arch&gt;,
           virtfs-proxy-helper, and
           vscclient
@@ -401,8 +413,5 @@
         <seg>libcacard.so</seg>
         <seg>
-          /etc/qemu,
-          /usr/include/cacard,
-          /usr/lib/qemu,
-          /usr/share/qemu, and
+          /etc/qemu and
           /usr/share/doc/qemu-&qemu-version;
         </seg>
Index: x/lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision 13d0d6f091ceee26a9341badadf169baa1c0f852)
+++ x/lib/qt5.xml	(revision 10f9bb4557a71277b9d20b13db4f6decd1a353a6)
@@ -83,4 +83,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="python2"/> and
       <xref linkend="xorg7-lib"/>
     </para>
