Index: x/installing/xfree86.xml
===================================================================
--- x/installing/xfree86.xml	(revision d4d659247315c037ff79e59792848442d616faa2)
+++ x/installing/xfree86.xml	(revision b6289f9c896cff24cb616ac28c0bf4cf7d8ec829)
@@ -187,9 +187,11 @@
       releases. Second, the macro "PAGE_MASK" is manually defined because
       including <filename>asm/page.h</filename> from the Linux kernel headers
-      does not work when compiling with <parameter>-ansi</parameter>. Finally,
+      does not work when compiling with <parameter>-ansi</parameter>. Third,
       the Linux kernel headers no longer install the unneeded header
       <filename>linux/config.h</filename>. A <command>sed</command> is used
-      to remove all usage of this header. Perform these actions with the
-      following commands:</para>
+      to remove all usage of this header. Finally, one of the input drivers
+      will not build with the <parameter>-ansi</parameter> setting, so the
+      <application>GCC</application> default is restored. Perform these
+      actions with the following commands:</para>
 
 <screen><userinput>patch -Np1 -i ../XFree86-&xfree86-version;-freetype_internals-1.patch &amp;&amp;
@@ -197,5 +199,7 @@
     programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c &amp;&amp;
 grep -rl '^#include &lt;linux/config.h&gt;' . | \
-    xargs sed -i '\@^#include &lt;linux/config.h&gt;@d'</userinput></screen>
+    xargs sed -i '\@^#include &lt;linux/config.h&gt;@d' &amp;&amp;
+echo 'CCOPTIONS += -std=gnu89' &gt;&gt; \
+    programs/Xserver/hw/xfree86/input/ur98/Imakefile</userinput></screen>
 
     </sect3>
@@ -239,46 +243,62 @@
 <literal>/* Begin XFree86 host.def file */
 
-/* This setting reduces compile time a little by omitting rarely used
- * input devices.  You can find the complete list in
- * config/cf/xfree86.cf *********************************************/
-
-#define XInputDrivers                 mouse void
-
-/* VIDEO DRIVERS ****************************************************
- * If you are sure you only want the drivers for one or a few video
- * cards, you can delete the drivers you do not want. ***************/
-
-#define XF86CardDrivers  mga glint nv tga s3 s3virge sis rendition \
-                         neomagic i740 tdfx savage \
-                         cirrus vmware tseng trident chips apm \
-                         GlideDriver fbdev i128 nsc \
-                         ati i810 DevelDrivers ark \
-                         cyrix siliconmotion \
-                         v4l vesa vga \
-                         dummy XF86OSCardDrivers XF86ExtraCardDrivers
-
-/* These settings ensure we use our libraries ************************/
-#define HasFreetype2             YES
-#define HasFontconfig            YES
-#define HasExpat                 YES
-#define HasLibpng                YES
-#define HasZlib                  YES
-
-/* Uncomment the following define if you'd like
- * xdm to use Linux-PAM
-#define HasPam                  YES
+/* COMPILER SETTINGS
+ * The default compiler settings for x86 are shown below. These settings
+ * and those for other architectures can be found in config/cf/xfree86.cf.
+#define DefaultGcc2i386Opt  -O2 -fno-strength-reduce -fno-strict-aliasing
  */
 
-/* GENERAL SETTINGS */
-
-#define SystemManDirectory        /usr/share/man
-#define DocDir                    /usr/share/doc/xfree86-4.6.0
-
-/* Installation prefix. The default is to install into /usr/X11R6. If you
- * would like to install into /usr, uncomment these options. */
-
-/* #define ProjectRoot            /usr */
-/* #define LinkGLToUsrLib         NO   */
-/* #define LinkGLToUsrInclude     NO   */
+/* INPUT DRIVERS
+ * The build will pick the correct drivers for your platform, but a shorter
+ * list can be defined to reduce compile time if they will not all be needed.
+ * The list below shows the default input drivers from config/cf/xfree86.cf.
+ *
+#define XInputDrivers    mouse keyboard acecad calcomp citron \
+                         digitaledge dmc dynapro elographics tek4957 \
+                         microtouch mutouch penmount spaceorb summa \
+                         wacom void magellan magictouch hyperpen \
+                         jamstudio fpit palmax \
+                         OSXInputDrivers ExtraXInputDrivers
+ */
+
+/* VIDEO DRIVERS
+ * The build will pick the correct drivers for your platform, but a shorter
+ * list can be defined to reduce compile time if they will not all be needed.
+ * The list below shows the default input drivers from config/cf/xfree86.cf.
+ *
+#define XF86CardDrivers  mga glint nv tga s3 s3virge sis xgi rendition \
+                         neomagic i740 tdfx savage cirrus vmware tseng \
+                         trident chips aspeed apm GlideDriver i128 NscDriver \
+                         ati i810 AgpGartDrivers DevelDrivers ark cyrix \
+                         siliconmotion via fbdev vesa vga dummy \
+                         XF86OSCardDrivers XF86ExtraCardDrivers
+ */
+
+/* SYSTEM LIBRARIES
+ * These settings ensure we use our libraries. Comment them if you prefer to
+ * use the versions shipped with XFree86.
+ */
+#define HasFreetype2        YES
+#define HasFontconfig       YES
+#define HasExpat            YES
+#define HasLibpng           YES
+#define HasZlib             YES
+
+/* Use Linux-PAM with xdm
+#define HasPam              YES
+ */
+
+/* GENERAL SETTINGS
+ */
+#define ManPath             /usr/share/man
+#define DocDir              /usr/share/doc/xfree86-4.6.0
+
+/* INSTALLATION PREFIX
+ * The default is to install into /usr/X11R6. If you would like to install
+ * into /usr, uncomment these options.
+#define ProjectRoot         /usr
+#define LinkGLToUsrLib      NO
+#define LinkGLToUsrInclude  NO
+ */
 
 /* End XFree86 host.def file */</literal>
