Index: x/installing/intel-vaapi-driver.xml
===================================================================
--- x/installing/intel-vaapi-driver.xml	(revision 5edd53e754d6edf62a0fd34860fdf639bf1b42d8)
+++ x/installing/intel-vaapi-driver.xml	(revision 5edd53e754d6edf62a0fd34860fdf639bf1b42d8)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY intel-vaapi-driver-version       "2.4.1">
+  <!ENTITY intel-vaapi-driver-download-http "https://github.com/intel/intel-vaapi-driver/releases/download/&intel-vaapi-driver-version;/intel-vaapi-driver-&intel-vaapi-driver-version;.tar.bz2">
+  <!ENTITY intel-vaapi-driver-download-ftp  " ">
+  <!ENTITY intel-vaapi-driver-md5sum        "073fce0f409559109ad2dd0a6531055d">
+  <!ENTITY intel-vaapi-driver-size          "2.8 MB">
+  <!ENTITY intel-vaapi-driver-buildsize     "97 MB">
+  <!ENTITY intel-vaapi-driver-time          "0.3 SBU">
+]>
+
+  <sect2 id="intel-vaapi-driver" xreflabel="intel-vaapi-driver-&intel-vaapi-driver-version;">
+
+    <title>intel-vaapi-driver-&intel-vaapi-driver-version;</title>
+
+    <indexterm zone="intel-vaapi-driver">
+      <primary sortas="a-intel-vaapi-driver">intel-vaapi-driver</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to intel-vaapi-driver</title>
+
+      <para>
+         The <application>intel-vaapi-driver</application> package contains
+         a VA API driver for Intel GPUs that are provided with Haswell CPUs
+         and earlier.
+      </para>
+
+      &lfs113_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&intel-vaapi-driver-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&intel-vaapi-driver-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &intel-vaapi-driver-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &intel-vaapi-driver-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &intel-vaapi-driver-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &intel-vaapi-driver-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">intel-vaapi-driver Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="libva"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/intel-vaapi-driver"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of intel-vaapi-driver</title>
+
+      <para>
+        Install the driver by running the following commands:
+      </para>
+
+<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+make</userinput></screen>
+
+      <para>
+        This package does not come with a test suite.
+      </para>
+
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Driver</segtitle>
+
+        <seglistitem>
+          <seg>
+            i965_drv_video.so
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: x/installing/libva.xml
===================================================================
--- x/installing/libva.xml	(revision 25707aa76789c36d0d522b5b371e6b97aa9acd69)
+++ x/installing/libva.xml	(revision 5edd53e754d6edf62a0fd34860fdf639bf1b42d8)
@@ -6,5 +6,4 @@
 
   <!ENTITY libva-version                "2.17.0">
-  <!ENTITY libva-intel-driver-version   "2.4.1">
 
   <!ENTITY libva-download-http "https://github.com/intel/libva/releases/download/&libva-version;/libva-&libva-version;.tar.bz2">
@@ -14,12 +13,4 @@
   <!ENTITY libva-buildsize     "9.5 MB">
   <!ENTITY libva-time          "less than 0.1 SBU">
-
-
-  <!ENTITY libva-intel-driver-download-http "https://github.com/intel/intel-vaapi-driver/releases/download/&libva-intel-driver-version;/intel-vaapi-driver-&libva-intel-driver-version;.tar.bz2">
-  <!ENTITY libva-intel-driver-download-ftp  " ">
-  <!ENTITY libva-intel-driver-md5sum        "073fce0f409559109ad2dd0a6531055d">
-  <!ENTITY libva-intel-driver-size          "2.8 MB">
-  <!ENTITY libva-intel-driver-buildsize     "97 MB">
-  <!ENTITY libva-intel-driver-time          "0.3 SBU">
 ]>
 
@@ -88,38 +79,4 @@
       </itemizedlist>
 
-      <bridgehead renderas="sect4">Additional Downloads</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Intel Driver Download (HTTP): <ulink url="&libva-intel-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Intel Driver Download (FTP): <ulink url="&libva-intel-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Intel Driver Download MD5 sum: &libva-intel-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Intel Driver Download size: &libva-intel-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &libva-intel-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &libva-intel-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
       <bridgehead renderas="sect4">libva Dependencies</bridgehead>
 
@@ -176,32 +133,4 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <bridgehead renderas="sect3">Installation of intel-vaapi-driver</bridgehead>
-
-      <para>
-        The <application>intel-vaapi-driver</application> is designed
-        specifically for video cards based on an Intel GPU.
-        Unpack the intel-vaapi tarball:
-      </para>
-
-<screen><userinput>tar -xvf ../intel-vaapi-driver-&libva-intel-driver-version;.tar.bz2 &amp;&amp;
-cd intel-vaapi-driver-&libva-intel-driver-version;</userinput></screen>
-
-      <para>
-        Install the driver by running the following commands:
-      </para>
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
     </sect3>
 
@@ -212,5 +141,4 @@
         <segtitle>Installed Programs</segtitle>
         <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Driver</segtitle>
         <segtitle>Installed Directory</segtitle>
 
@@ -225,7 +153,4 @@
             libva-wayland.so, and
             libva-x11.so
-          </seg>
-          <seg>
-            i965_drv_video.so
           </seg>
           <seg>
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision 25707aa76789c36d0d522b5b371e6b97aa9acd69)
+++ x/installing/x7driver.xml	(revision 5edd53e754d6edf62a0fd34860fdf639bf1b42d8)
@@ -158,4 +158,9 @@
         <listitem>
           <para>
+            <xref linkend="intel-vaapi-driver"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
             <xref linkend="libva"/>
           </para>
@@ -220,4 +225,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="intel-vaapi-driver.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="libva.xml"/>
 
