Index: general.ent
===================================================================
--- general.ent	(revision 1274b74a00e9712a7c4513091745c6e57e373607)
+++ general.ent	(revision d37606854c3b43a49a4e361700c50c3eda3b6fd3)
@@ -632,4 +632,6 @@
 <!ENTITY libXp-version                "1.0.1">
 <!ENTITY xorg-server-version          "1.12.2">
+<!-- This is latest nouveau snapshot that does not need libdrm >= 2.4.34 -->
+<!ENTITY xorg-nouveau-driver-version  "0.0.16+git20120322">
 <!ENTITY xorg-wacom-driver-version    "0.14.0">
 <!ENTITY twm-version                  "1.0.7">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 1274b74a00e9712a7c4513091745c6e57e373607)
+++ introduction/welcome/changelog.xml	(revision d37606854c3b43a49a4e361700c50c3eda3b6fd3)
@@ -91,4 +91,7 @@
           <para>[abenton] - Updated Xine Ui to 0.99.7.</para>
         </listitem>
+        <listitem>
+          <para>[krejzi] - Added Xorg Nouveau Driver.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision 1274b74a00e9712a7c4513091745c6e57e373607)
+++ x/installing/installing.xml	(revision d37606854c3b43a49a4e361700c50c3eda3b6fd3)
@@ -68,5 +68,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-server.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7additionaldrivers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driveradd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="twm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xterm.xml"/>
Index: installing/x7additionaldrivers.xml
===================================================================
--- x/installing/x7additionaldrivers.xml	(revision 1274b74a00e9712a7c4513091745c6e57e373607)
+++ 	(revision )
@@ -1,228 +1,0 @@
-<?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 xorg-wacom-driver-download-http 
-           "&sourceforge-repo;/linuxwacom/xf86-input-wacom-&xorg-wacom-driver-version;.tar.bz2">
-  <!ENTITY xorg-wacom-driver-download-ftp  " ">
-  <!ENTITY xorg-wacom-driver-md5sum        "23d19a2b50a86b848df17297c745144f">
-  <!ENTITY xorg-wacom-driver-size          "504 KB">
-  <!ENTITY xorg-wacom-driver-buildsize     "6.5 MB">
-  <!ENTITY xorg-wacom-driver-time          "0.1 SBU">
-
-]>
-
-<sect1 id="x7additionaldrivers" xreflabel="Additional Xorg Drivers">
-  <?dbhtml filename="x7additionaldrivers.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Additional Xorg Drivers</title>
-
-  <indexterm zone="x7additionaldrivers">
-    <primary sortas="a-x7additionaldrivers">x7additionaldrivers</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Additional Xorg Drivers</title>
-
-    <para>
-      The <application>Additional Xorg Drivers</application> page contains the
-      instructions for building Xorg drivers that were not included on the
-      Xorg Drivers page.
-    </para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <xref linkend="xorg-wacom-driver"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-<!-- Begin Xorg Wacom Driver -->
-  <sect2 id="xorg-wacom-driver" xreflabel="Xorg Wacom Driver-&xorg-wacom-driver-version;">
-
-    <title>Xorg Wacom Driver-&xorg-wacom-driver-version;</title>
-
-    <indexterm zone="xorg-wacom-driver">
-      <primary sortas="a-xorg-wacom-driver">xorg-wacom-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg Wacom Driver</title>
-
-      <para>
-        The <application>Xorg Wacom Driver</application> package contains the 
-        X.Org X11 driver and SDK for Wacom and Wacom-like tablets. It is not
-        required to use a Wacom tablet, the
-        <application>xf86-input-evdev</application> driver can handle these
-        devices without problems.
-      </para>
-
-      &lfs70_built;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-wacom-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-wacom-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-wacom-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-wacom-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-wacom-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-wacom-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg Wacom Drivers Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="doxygen"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-wacom-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-wacom-driver-kernel">
-      <title>Kernel Configuration</title>
-
-      <para>
-        To use a Wacom tablet, enable the following options in your kernel
-        configuration and recompile:
-      </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Input device support  ---&gt;
-    [*]   Tablets  ---&gt;
-      [*]   Wacom Intuos/Graphire tablet support (USB)</literal></screen>
-
-      <indexterm zone="xorg-wacom-driver xorg-wacom-driver-kernel">
-        <primary sortas="d-xorg-wacom-driver">xorg-wacom-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Wacom Driver</title>
-
-      <para>
-        Install <application>Xorg Wacom Driver</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure $XORG_CONFIG \
-            --with-xorg-module-dir=$XORG_PREFIX/lib/X11/modules &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="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <parameter>--with-xorg-module-dir=...</parameter>: This switch
-        ensures that the drivers are installed into the correct directory.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Library</segtitle>
-
-        <seglistitem>
-          <seg>
-            isdv4-serial-debugger and xsetwacom
-          </seg>
-          <seg>
-            wacom_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="xsetwacom">
-          <term><command>xsetwacom</command></term>
-          <listitem>
-            <para>
-              is an commandline utility used to query 
-              and modify wacom driver settings.
-            </para>
-            <indexterm zone="xorg-wacom-driver xsetwacom">
-              <primary sortas="b-xsetwacom">xsetwacom</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="wacom_drv">
-          <term><filename class="libraryfile">wacom_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an X input driver for Wacom devices.
-            </para>
-            <indexterm zone="xorg-wacom-driver wacom_drv">
-              <primary sortas="c-wacom_drv">wacom_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-<!-- End Xorg Wacom Driver -->
-
-</sect1>
Index: x/installing/x7driveradd.xml
===================================================================
--- x/installing/x7driveradd.xml	(revision d37606854c3b43a49a4e361700c50c3eda3b6fd3)
+++ x/installing/x7driveradd.xml	(revision d37606854c3b43a49a4e361700c50c3eda3b6fd3)
@@ -0,0 +1,377 @@
+<?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 xorg-nouveau-driver-download-http
+           "http://www.linuxfromscratch.org/~krejzi/xf86-video-nouveau-&xorg-nouveau-driver-version;.tar.xz">
+  <!ENTITY xorg-nouveau-driver-download-ftp  " ">
+  <!ENTITY xorg-nouveau-driver-md5sum        "ae3fccbe6d0b009230508ef5ebb623cf">
+  <!ENTITY xorg-nouveau-driver-size          "324 KB">
+  <!ENTITY xorg-nouveau-driver-buildsize     "9.2 MB">
+  <!ENTITY xorg-nouveau-driver-time          "0.2 SBU">
+
+  <!ENTITY xorg-wacom-driver-download-http 
+           "&sourceforge-repo;/linuxwacom/xf86-input-wacom-&xorg-wacom-driver-version;.tar.bz2">
+  <!ENTITY xorg-wacom-driver-download-ftp  " ">
+  <!ENTITY xorg-wacom-driver-md5sum        "23d19a2b50a86b848df17297c745144f">
+  <!ENTITY xorg-wacom-driver-size          "504 KB">
+  <!ENTITY xorg-wacom-driver-buildsize     "6.5 MB">
+  <!ENTITY xorg-wacom-driver-time          "0.1 SBU">
+
+]>
+
+<sect1 id="x7driveradd" xreflabel="Additional Xorg Drivers">
+  <?dbhtml filename="x7driveradd.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Additional Xorg Drivers</title>
+
+  <indexterm zone="x7driveradd">
+    <primary sortas="a-x7driveradd">x7driveradd</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Additional Xorg Drivers</title>
+
+    <para>
+      The <application>Additional Xorg Drivers</application> page contains the
+      instructions for building Xorg drivers that were not included on the
+      Xorg Drivers page.
+    </para>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          <xref linkend="xorg-nouveau-driver"/>
+        </para>
+        <para>
+          <xref linkend="xorg-wacom-driver"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+  </sect2>
+
+<!-- Begin Xorg Nouveau Driver -->
+  <sect2 id="xorg-nouveau-driver" xreflabel="Xorg Nouveau Driver-&xorg-nouveau-driver-version;">
+
+    <title>Xorg Nouveau Driver-&xorg-nouveau-driver-version;</title>
+
+    <indexterm zone="xorg-nouveau-driver">
+      <primary sortas="a-xorg-nouveau-driver">xorg-nouveau-driver</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Xorg Nouveau Driver</title>
+
+      <para>
+        The <application>Xorg Nouveau Driver</application> package contains the 
+        X.Org Video Driver for NVidia Cards including RIVA TNT, RIVA TNT2,
+        GeForce 256, QUADRO, GeForce2, QUADRO2, GeForce3, QUADRO DDC,
+        nForce, nForce2, GeForce4, QUADRO4, GeForce FX, QUADRO FX, GeForce 6XXX and
+        GeForce 7xxx chipsets.
+      </para>
+
+      &lfs70_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&xorg-nouveau-driver-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&xorg-nouveau-driver-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &xorg-nouveau-driver-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &xorg-nouveau-driver-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &xorg-nouveau-driver-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &xorg-nouveau-driver-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Xorg Nouveau Drivers Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="xorg-server"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/xorg-nouveau-driver"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Xorg Nouveau Driver</title>
+
+      <para>
+        Install <application>Xorg Nouveau Driver</application> by running the following
+        commands:
+      </para>
+
+<screen><userinput>./configure $XORG_CONFIG \
+            --with-xorg-module-dir=$XORG_PREFIX/lib/X11/modules &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="commands">
+      <title>Command Explanations</title>
+
+      <para>
+        <parameter>--with-xorg-module-dir=...</parameter>: This switch
+        ensures that the drivers are installed into the correct directory.
+      </para>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Library</segtitle>
+
+        <seglistitem>
+          <seg>
+            nouveau_drv.so
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <variablelist>
+        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
+        <?dbfo list-presentation="list"?>
+        <?dbhtml list-presentation="table"?>
+
+        <varlistentry id="nouveau_drv">
+          <term><filename class="libraryfile">nouveau_drv.so</filename></term>
+          <listitem>
+            <para>
+              is an Xorg driver for NVidia Video Cards.
+            </para>
+            <indexterm zone="xorg-nouveau-driver nouveau_drv">
+              <primary sortas="c-nouveau_drv">nouveau_drv.so</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+
+    </sect3>
+
+  </sect2>
+<!-- End Xorg Nouveau Driver -->
+
+<!-- Begin Xorg Wacom Driver -->
+  <sect2 id="xorg-wacom-driver" xreflabel="Xorg Wacom Driver-&xorg-wacom-driver-version;">
+
+    <title>Xorg Wacom Driver-&xorg-wacom-driver-version;</title>
+
+    <indexterm zone="xorg-wacom-driver">
+      <primary sortas="a-xorg-wacom-driver">xorg-wacom-driver</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Xorg Wacom Driver</title>
+
+      <para>
+        The <application>Xorg Wacom Driver</application> package contains the 
+        X.Org X11 driver and SDK for Wacom and Wacom-like tablets. It is not
+        required to use a Wacom tablet, the
+        <application>xf86-input-evdev</application> driver can handle these
+        devices without problems.
+      </para>
+
+      &lfs70_built;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&xorg-wacom-driver-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&xorg-wacom-driver-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &xorg-wacom-driver-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &xorg-wacom-driver-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &xorg-wacom-driver-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &xorg-wacom-driver-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Xorg Wacom Drivers Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="xorg-server"/>
+      </para>
+
+      <bridgehead renderas="sect5">Optional</bridgehead>
+      <para role="optional">
+        <xref linkend="doxygen"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/xorg-wacom-driver"/>
+      </para>
+    </sect3>
+
+    <sect3 role="kernel" id="xorg-wacom-driver-kernel">
+      <title>Kernel Configuration</title>
+
+      <para>
+        To use a Wacom tablet, enable the following options in your kernel
+        configuration and recompile:
+      </para>
+
+<screen><literal>Device Drivers  ---&gt;
+  Input device support  ---&gt;
+    [*]   Tablets  ---&gt;
+      [*]   Wacom Intuos/Graphire tablet support (USB)</literal></screen>
+
+      <indexterm zone="xorg-wacom-driver xorg-wacom-driver-kernel">
+        <primary sortas="d-xorg-wacom-driver">xorg-wacom-driver</primary>
+      </indexterm>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Xorg Wacom Driver</title>
+
+      <para>
+        Install <application>Xorg Wacom Driver</application> by running the following
+        commands:
+      </para>
+
+<screen><userinput>./configure $XORG_CONFIG \
+            --with-xorg-module-dir=$XORG_PREFIX/lib/X11/modules &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="commands">
+      <title>Command Explanations</title>
+
+      <para>
+        <parameter>--with-xorg-module-dir=...</parameter>: This switch
+        ensures that the drivers are installed into the correct directory.
+      </para>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Library</segtitle>
+
+        <seglistitem>
+          <seg>
+            isdv4-serial-debugger and xsetwacom
+          </seg>
+          <seg>
+            wacom_drv.so
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <variablelist>
+        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
+        <?dbfo list-presentation="list"?>
+        <?dbhtml list-presentation="table"?>
+
+        <varlistentry id="xsetwacom">
+          <term><command>xsetwacom</command></term>
+          <listitem>
+            <para>
+              is an commandline utility used to query 
+              and modify wacom driver settings.
+            </para>
+            <indexterm zone="xorg-wacom-driver xsetwacom">
+              <primary sortas="b-xsetwacom">xsetwacom</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="wacom_drv">
+          <term><filename class="libraryfile">wacom_drv.so</filename></term>
+          <listitem>
+            <para>
+              is an X input driver for Wacom devices.
+            </para>
+            <indexterm zone="xorg-wacom-driver wacom_drv">
+              <primary sortas="c-wacom_drv">wacom_drv.so</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+
+    </sect3>
+
+  </sect2>
+<!-- End Xorg Wacom Driver -->
+
+</sect1>
