Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision a153d4221b548e63d5f540cbebcac87fb307d0f2)
+++ x/installing/x7driver.xml	(revision 51ecf014fbd96e5dc617be47b9aadb39d9ff7e73)
@@ -14,11 +14,11 @@
   <!ENTITY xorg-evdev-driver-time          "less than 0.1 SBU">
 
-  <!ENTITY xorg-synaptics-driver-version "1.6.2">
+  <!ENTITY xorg-synaptics-driver-version "1.6.3">
 
   <!ENTITY xorg-synaptics-driver-download-http "&xorg-download-http;/driver/xf86-input-synaptics-&xorg-synaptics-driver-version;.tar.bz2">
   <!ENTITY xorg-synaptics-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-input-synaptics-&xorg-synaptics-driver-version;.tar.bz2">
-  <!ENTITY xorg-synaptics-driver-md5sum        "9914022a173e3f0ccfe7137ab84f6133">
-  <!ENTITY xorg-synaptics-driver-size          "432 KB">
-  <!ENTITY xorg-synaptics-driver-buildsize     "5.2 MB">
+  <!ENTITY xorg-synaptics-driver-md5sum        "3568930b0bda522e00272b64c0ca2ca2">
+  <!ENTITY xorg-synaptics-driver-size          "436 KB">
+  <!ENTITY xorg-synaptics-driver-buildsize     "5.9 MB">
   <!ENTITY xorg-synaptics-driver-time          "less than 0.1 SBU">
 
@@ -32,11 +32,11 @@
   <!ENTITY xorg-vmmouse-driver-time          "less than 0.1 SBU">
 
-  <!ENTITY xorg-wacom-driver-version "0.19.0">
+  <!ENTITY xorg-wacom-driver-version "0.20.0">
 
   <!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        "bdc66047bb0afb4ac29882cca16cdfaa">
-  <!ENTITY xorg-wacom-driver-size          "520 KB">
-  <!ENTITY xorg-wacom-driver-buildsize     "7.0 MB">
+  <!ENTITY xorg-wacom-driver-md5sum        "a726649cb05c98cb1b18a3b7a4f079ed">
+  <!ENTITY xorg-wacom-driver-size          "528 KB">
+  <!ENTITY xorg-wacom-driver-buildsize     "7.8 MB">
   <!ENTITY xorg-wacom-driver-time          "less than 0.1 SBU">
 
@@ -86,11 +86,11 @@
   <!ENTITY xorg-mga-driver-time          "0.1 SBU">
 
-  <!ENTITY xorg-nouveau-driver-version "1.0.4">
+  <!ENTITY xorg-nouveau-driver-version "1.0.6">
 
   <!ENTITY xorg-nouveau-driver-download-http "&xorg-download-http;/driver/xf86-video-nouveau-&xorg-nouveau-driver-version;.tar.bz2">
   <!ENTITY xorg-nouveau-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-nouveau-&xorg-nouveau-driver-version;.tar.bz2">
-  <!ENTITY xorg-nouveau-driver-md5sum        "cff61597d94a06ddf73c32439437513f">
+  <!ENTITY xorg-nouveau-driver-md5sum        "140e819c983fc01ed7a52d915dcffd74">
   <!ENTITY xorg-nouveau-driver-size          "544 KB">
-  <!ENTITY xorg-nouveau-driver-buildsize     "11 MB">
+  <!ENTITY xorg-nouveau-driver-buildsize     "13 MB">
   <!ENTITY xorg-nouveau-driver-time          "0.1 SBU">
 
@@ -1181,5 +1181,7 @@
       </para>
 
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+<screen><userinput>sed -e "/mibstore.h/d" -e "/miInitializeBackingStore/d" \
+    -i src/fbdev.c &amp;&amp;
+./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
@@ -1193,4 +1195,14 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+    </sect3>
+
+    <sect3 role="commands">
+      <title>Command Explanations</title>
+
+      <para>
+        <command>sed -e "/mibstore.h/d" ...</command>: Fixes building
+        with <application>Xorg Server</application> 1.14.0.
+      </para>
+
     </sect3>
 
@@ -2312,4 +2324,14 @@
       </itemizedlist>
 
+      <bridgehead renderas="sect4">Additional Downloads</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Required patch:
+            <ulink url="&patch-root;/xf86-video-sis-&xorg-sis-driver-version;-upstream_fixes-1.patch"/>
+          </para>
+        </listitem>
+      </itemizedlist>
+
       <bridgehead renderas="sect4">Xorg SiS Driver Dependencies</bridgehead>
 
@@ -2350,5 +2372,6 @@
       </para>
 
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+<screen><userinput>patch -Np1 -i ../xf86-video-sis-&xorg-sis-driver-version;-upstream_fixes-1.patch &amp;&amp;
+./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
@@ -2493,5 +2516,7 @@
       </para>
 
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+<screen><userinput>sed -e "/mibstore.h/d" -e "/miInitializeBackingStore/d" \
+    -i src/tdfx_driver.c &amp;&amp;
+./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
@@ -2505,4 +2530,14 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+    </sect3>
+
+    <sect3 role="commands">
+      <title>Command Explanations</title>
+
+      <para> 
+        <command>sed -e "/mibstore.h/d" ...</command>: Fixes building 
+        with <application>Xorg Server</application> 1.14.0. 
+      </para>
+
     </sect3>
 
@@ -2639,5 +2674,8 @@
       </para>
 
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+<screen><userinput>sed -e "/mibstore.h/d" -e "/miInitializeBackingStore/d" \
+    -e "s/MODE_QUERY &lt; 0/function &lt; MODE_QUERY/g" \
+    -i src/vesa.c &amp;&amp;
+./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
@@ -2651,4 +2689,14 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+    </sect3>
+
+   <sect3 role="commands">
+      <title>Command Explanations</title>
+
+      <para> 
+        <command>sed -e "/mibstore.h/d" ...</command>: Fixes building 
+        with <application>Xorg Server</application> 1.14.0. 
+      </para>
+
     </sect3>
 
@@ -2781,5 +2829,7 @@
       </para>
 
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+<screen><userinput>sed -e "/mibstore.h/d" -e "/miInitializeBackingStore/d" \
+    -i saa/saa_priv.h src/vmware.c vmwgfx/vmwgfx_driver.c &amp;&amp;
+ ./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
@@ -2793,4 +2843,14 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+    </sect3>
+
+    <sect3 role="commands">
+      <title>Command Explanations</title>
+
+      <para> 
+        <command>sed -e "/mibstore.h/d" ...</command>: Fixes building 
+        with <application>Xorg Server</application> 1.14.0. 
+      </para>
+
     </sect3>
 
