--- a/docs/doc/kbd.FAQ-15.html.orig	2012-02-27 13:27:11.000000000 +0300
+++ b/docs/doc/kbd.FAQ-15.html	2013-07-30 18:56:43.697000005 +0300
@@ -188,7 +188,7 @@
 <P>XFree86 also supports Slow Keys, Repeat Keys, Bounce Keys and an
 audible bell. <CODE>xkbcomp</CODE> can be used to generate a <CODE>.xkm</CODE> file
 to enable these. The appropriate <CODE>xkbcomp</CODE> commands are listed in
-<CODE>/usr/X11R6/lib/X11/xkb/compat/accessx</CODE>.
+<CODE>/usr/{X11R6/lib,share}/X11/xkb/compat/accessx</CODE>.
 Unfortunately, the exact process is still undocumented.
 <P>
 <HR>
--- a/docs/doc/kbd.FAQ.txt.orig	2012-02-27 13:27:11.000000000 +0300
+++ b/docs/doc/kbd.FAQ.txt	2013-07-30 18:57:41.150000005 +0300
@@ -1253,7 +1253,7 @@
   1. The Linux keyboard driver mechanism, used in conjunction with
      loadkeys.
   2. The X mechanism - see X386keybd(1), later XFree86kbd(1).  Under
-     X11R6: edit /usr/X11R6/lib/X11/locale/iso8859-1/Compose.
+     X11R6: edit /usr/{X11R6/lib,/usr/share}/X11/locale/iso8859-1/Compose.
 
      See also Andrew D. Balsa's comments at
      http://wauug.erols.com/~balsa/linux/deadkeys/index.html.
--- a/docs/doc/kbd.FAQ-8.html.orig	2012-02-27 13:27:11.000000000 +0300
+++ b/docs/doc/kbd.FAQ-8.html	2013-07-30 18:58:23.978000004 +0300
@@ -154,7 +154,7 @@
 <OL>
 <LI>The Linux keyboard driver mechanism, used in conjunction with loadkeys.</LI>
 <LI>The X mechanism - see X386keybd(1), later XFree86kbd(1).
-Under X11R6: edit <CODE>/usr/X11R6/lib/X11/locale/iso8859-1/Compose</CODE>.<P>See also Andrew D. Balsa's comments at
+Under X11R6: edit <CODE>/usr/{X11R6/lib,share}/X11/locale/iso8859-1/Compose</CODE>.<P>See also Andrew D. Balsa's comments at
 <A HREF="http://wauug.erols.com/~balsa/linux/deadkeys/index.html">http://wauug.erols.com/~balsa/linux/deadkeys/index.html</A>.
 </LI>
 <LI>The emacs mechanism obtained by loading "iso-insert.el" or