diff --git a/general/prog/elfutils.xml b/general/prog/elfutils.xml
index 7f3e72e3fe..6520bf4684 100644
--- a/general/prog/elfutils.xml
+++ b/general/prog/elfutils.xml
@@ -7,7 +7,7 @@
   <!ENTITY elfutils-download-http
           "https://fedorahosted.org/releases/e/l/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
   <!ENTITY elfutils-download-ftp  " ">
-  <!ENTITY elfutils-md5sum        "77ce87f259987d2e54e4d87b86cbee41">
+  <!ENTITY elfutils-md5sum        "2e4536c1c48034f188a80789a59114d8">
   <!ENTITY elfutils-size          "5.8 MB">
   <!ENTITY elfutils-buildsize     "103 MB (with tests)">
   <!ENTITY elfutils-time          "0.8 SBU (with tests)">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 5409fcf843..461c14c0ff 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,20 @@
 
 -->
 
+    <listitem>
+      <para>October 18th, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to libva-intel-driver-1.6.1 / libva-1.6.1. Fixes
+          <ulink url="&blfs-ticket-root;6921">#6921</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xkeyboard-config-2.16. Fixes
+          <ulink url="&blfs-ticket-root;7021">#7021</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>October 17th, 2015</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index 7c756a8731..c14526ac04 100644
--- a/packages.ent
+++ b/packages.ent
@@ -441,7 +441,7 @@
 <!ENTITY libxcb-version               "1.11.1">
 <!ENTITY xbitmaps-version             "1.1.1">
 <!ENTITY xcursor-themes-version       "1.0.4">
-<!ENTITY xkeyboard-config-version     "2.15">
+<!ENTITY xkeyboard-config-version     "2.16">
 <!ENTITY mesa-version                 "11.0.3">
 <!ENTITY xcb-util-version             "0.4.0">
 <!ENTITY xcb-util-image-version       "0.4.0">
@@ -720,8 +720,8 @@
 <!ENTITY xvid-version                 "1.3.3">
 
 <!-- Chapter 46 -->
-<!ENTITY libva-version                "1.6.0">
-<!ENTITY libva-intel-driver-version   "1.6.0">
+<!ENTITY libva-version                "1.6.1">
+<!ENTITY libva-intel-driver-version   "1.6.1">
 <!ENTITY libvdpau-version             "1.1.1">
 <!ENTITY libvdpau-va-gl-version       "0.3.4">
 
diff --git a/x/installing/libva.xml b/x/installing/libva.xml
index 1e85126d9a..e85380c0bb 100644
--- a/x/installing/libva.xml
+++ b/x/installing/libva.xml
@@ -8,16 +8,16 @@
 
   <!ENTITY libva-download-http "&libva-http;/libva/libva-&libva-version;.tar.bz2">
   <!ENTITY libva-download-ftp  " ">
-  <!ENTITY libva-md5sum        "3f1241b4080db53c120325932f393f33">
-  <!ENTITY libva-size          "772 KB">
-  <!ENTITY libva-buildsize     "20 MB">
+  <!ENTITY libva-md5sum        "7a5eb1fdf531f987211b7228a6a46428">
+  <!ENTITY libva-size          "756 KB">
+  <!ENTITY libva-buildsize     "10 MB">
   <!ENTITY libva-time          "0.2 SBU">
 
   <!ENTITY libva-intel-driver-download-http "&libva-http;/libva-intel-driver/libva-intel-driver-&libva-intel-driver-version;.tar.bz2">
   <!ENTITY libva-intel-driver-download-ftp  " ">
-  <!ENTITY libva-intel-driver-md5sum        "d7678f7c66cbb135cced82ee2af6d8e8">
+  <!ENTITY libva-intel-driver-md5sum        "ed1b04c1a3c029ad389b7e23822a2762">
   <!ENTITY libva-intel-driver-size          "1.0 MB">
-  <!ENTITY libva-intel-driver-buildsize     "33 MB">
+  <!ENTITY libva-intel-driver-buildsize     "43 MB">
   <!ENTITY libva-intel-driver-time          "0.3 SBU">
 ]>
 
@@ -146,9 +146,7 @@
       commands:
     </para>
 
-<screen><userinput>mkdir -p m4 &amp;&amp;
-autoreconf -fi           &amp;&amp;
-./configure $XORG_CONFIG &amp;&amp;
+<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -173,9 +171,7 @@ make</userinput></screen>
       and install the driver by running the following commands:
     </para>
 
-<screen><userinput>mkdir -p m4              &amp;&amp;
-autoreconf -fi           &amp;&amp;
-./configure $XORG_CONFIG &amp;&amp;
+<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -190,14 +186,10 @@ make</userinput></screen>
 
   </sect3>
 
+<!--
   <sect3 role="commands">
     <title>Command Explanations</title>
 
-    <para>
-      <command>mkdir -p m4</command>: This command prevents an error
-      that may occur when running autoreconf.
-    </para>
-
     <para>
       <command>autoreconf -fi</command>: This command regenerates
       the configure script to prevent a mandatory test for 
@@ -205,7 +197,8 @@ make</userinput></screen>
     </para>
 
   </sect3>
- 
+-->
+
   <sect3 role="content">
     <title>Contents</title>
 
diff --git a/x/installing/xkeyboard-config.xml b/x/installing/xkeyboard-config.xml
index bb5f46f60c..2753be3bc1 100644
--- a/x/installing/xkeyboard-config.xml
+++ b/x/installing/xkeyboard-config.xml
@@ -8,9 +8,9 @@
   "&xorg-download-http;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
   <!ENTITY xkeyboard-config-download-ftp
   "&xorg-download-ftp;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
-  <!ENTITY xkeyboard-config-md5sum        "4af1deeb7c5f4cad62e65957d98d6758">
-  <!ENTITY xkeyboard-config-size          "940 KB">
-  <!ENTITY xkeyboard-config-buildsize     "19 MB">
+  <!ENTITY xkeyboard-config-md5sum        "bf6aa31195584cfce01b2194c3e5ea26">
+  <!ENTITY xkeyboard-config-size          "948 KB">
+  <!ENTITY xkeyboard-config-buildsize     "13 MB">
   <!ENTITY xkeyboard-config-time          "less than 0.1 SBU">
 ]>