Index: doc/faq/faq.sgml
===================================================================
--- doc/faq/faq.sgml.orig
+++ doc/faq/faq.sgml
@@ -455,12 +455,12 @@
      <para>
       If you want to have Xv support compiled in, make sure you either have
       a shared Xv library on your system, e.g.
-      <command>ls /usr/X11R6/lib/libXv*</command>
+      <command>ls /usr/lib/libXv*</command>
       should give you some .so libs, like this:
       <screen>
-&nbsp;&nbsp;&nbsp;/usr/X11R6/lib/libXv.a
-&nbsp;&nbsp;&nbsp;/usr/X11R6/lib/libXv.so
-&nbsp;&nbsp;&nbsp;/usr/X11R6/lib/libXv.so.1</screen>
+&nbsp;&nbsp;&nbsp;/usr/lib/libXv.a
+&nbsp;&nbsp;&nbsp;/usr/lib/libXv.so
+&nbsp;&nbsp;&nbsp;/usr/lib/libXv.so.1</screen>
      </para>
      <para>
       Alternatively you need to have libtool 1.4 or newer installed, then
Index: doc/README_xxmc.html
===================================================================
--- doc/README_xxmc.html.orig
+++ doc/README_xxmc.html
@@ -69,8 +69,7 @@
 installing</h2>
 Make sure you have the XvMC wrapper installed. The wrapper will try to
 figure out at run-time what xvmc-hardware specific driver to load. If
-it fails it will open the file <span style="font-family: monospace;">/etc/X11/XvMCConfig</span>
-or <span style="font-family: monospace;">/usr/X11R6/lib/X11/XvMCConfig</span>
+it fails it will open the file <span style="font-family: monospace;">/usr/lib/X11/XvMCConfig</span>
 and try to load the hardware-specific library mentioned in that file.
 If you downloaded the XvMC wrapper from the unichrome site, the default
 XvMCConfig will make the XvMC wrapper try to load the Nvidia XvMC