diff --git a/libX11-0.99.3-datadir-locale-dir-fix.patch b/libX11-0.99.3-datadir-locale-dir-fix.patch
new file mode 100644
index 0000000..f1f92df
--- /dev/null
+++ b/libX11-0.99.3-datadir-locale-dir-fix.patch
@@ -0,0 +1,11 @@
+--- configure.ac.datadir-locale-dir-fix	2005-11-22 12:34:53.000000000 -0500
++++ configure.ac	2005-11-22 12:35:13.000000000 -0500
+@@ -306,7 +306,7 @@
+ # in ${libdir}
+ #
+ 
+-X11_LOCALEDATADIR="${X11_LIBDIR}/locale"
++X11_LOCALEDATADIR="${X11_DATADIR}/locale"
+ X11_LOCALELIBDIR="${X11_LIBDIR}/locale/lib"
+ X11_LOCALEDIR="${X11_LOCALEDATADIR}"
+ XKEYSYMDB="${X11_DATADIR}/XKeysymDB"
diff --git a/libX11.spec b/libX11.spec
index 0b3a32b..01c2ebf 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -1,19 +1,13 @@
-# FIXME: Current build puts locale data into /usr/lib/X11/locale, but I
-# think it should be in /usr/share/X11/locale, as it is architecture
-# independant non-binary data.  I've made it configureable here for now
-# to ease making a transition one way or another.
-%define _x11localedir %{_libdir}/X11/locale
-#define _x11localedir %{_datadir}/X11/locale
-
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 0.99.3
-Release: 3
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2
+Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
@@ -42,29 +36,33 @@ X.Org X11 libX11 development package
 
 %prep
 %setup -q
+%patch0 -p0 -b .datadir-locale-dir-fix
 
 # Disable static library creation by default.
 %define with_static 0
 
 %build
-
+# FIXME: libX11-0.99.3-datadir-locale-dir-fix.patch patches configure.ac, so
+# we have to re-run autoconf:
+autoconf
 %configure \
+	--disable-dependency-tracking \
 %if ! %{with_static}
 	--disable-static
 %endif
+
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# FIXME: It seems upstream scripts do not like it if makeinstall is used.
-#%%makeinstall DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
+
 # FIXME: Don't install Xcms.txt - find out why upstream still ships this.
-rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Xcms.txt
+find $RPM_BUILD_ROOT -name 'Xcms.txt' -exec rm -f {} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,136 +73,137 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_x11localedir}/C
-%{_x11localedir}/C/*
-%dir %{_x11localedir}/armscii-8
-%{_x11localedir}/armscii-8/*
-%{_x11localedir}/compose.dir
-%dir %{_x11localedir}/en_US.UTF-8
-%{_x11localedir}/en_US.UTF-8/*
-%dir %{_x11localedir}/el_GR.UTF-8
-%{_x11localedir}/el_GR.UTF-8/*
-%dir %{_x11localedir}/georgian-academy
-%{_x11localedir}/georgian-academy/*
-%dir %{_x11localedir}/georgian-ps
-%{_x11localedir}/georgian-ps/*
-%dir %{_x11localedir}/ibm-cp1133
-%{_x11localedir}/ibm-cp1133/*
-%dir %{_x11localedir}/iscii-dev
-%{_x11localedir}/iscii-dev/*
-%dir %{_x11localedir}/isiri-3342
-%{_x11localedir}/isiri-3342/*
-%dir %{_x11localedir}/iso8859-*
-%{_x11localedir}/iso8859-*/*
-%dir %{_x11localedir}/ja.*
-%{_x11localedir}/ja.*/*
-%dir %{_x11localedir}/ja
-%{_x11localedir}/ja/*
-%dir %{_x11localedir}/ja_JP.UTF-8
-%{_x11localedir}/ja_JP.UTF-8/Compose
-%{_x11localedir}/ja_JP.UTF-8/XI18N_OBJS
-%{_x11localedir}/ja_JP.UTF-8/XLC_LOCALE
-%dir %{_x11localedir}/ko
-%{_x11localedir}/ko/Compose
-%{_x11localedir}/ko/XI18N_OBJS
-%{_x11localedir}/ko/XLC_LOCALE
-%dir %{_x11localedir}/ko_KR.UTF-8
-%{_x11localedir}/ko_KR.UTF-8/Compose
-%{_x11localedir}/ko_KR.UTF-8/XI18N_OBJS
-%{_x11localedir}/ko_KR.UTF-8/XLC_LOCALE
-%dir %{_x11localedir}/koi8-c
-%{_x11localedir}/koi8-c/Compose
-%{_x11localedir}/koi8-c/XI18N_OBJS
-%{_x11localedir}/koi8-c/XLC_LOCALE
-%dir %{_x11localedir}/koi8-r
-%{_x11localedir}/koi8-r/Compose
-%{_x11localedir}/koi8-r/XI18N_OBJS
-%{_x11localedir}/koi8-r/XLC_LOCALE
-%dir %{_x11localedir}/koi8-u
-%{_x11localedir}/koi8-u/Compose
-%{_x11localedir}/koi8-u/XI18N_OBJS
-%{_x11localedir}/koi8-u/XLC_LOCALE
-%{_x11localedir}/locale.alias
-%{_x11localedir}/locale.dir
-%dir %{_x11localedir}/microsoft-*
-%{_x11localedir}/microsoft-*/*
-%dir %{_x11localedir}/mulelao-1
-%{_x11localedir}/mulelao-1/Compose
-%{_x11localedir}/mulelao-1/XI18N_OBJS
-%{_x11localedir}/mulelao-1/XLC_LOCALE
-%dir %{_x11localedir}/nokhchi-1
-%{_x11localedir}/nokhchi-1/Compose
-%{_x11localedir}/nokhchi-1/XI18N_OBJS
-%{_x11localedir}/nokhchi-1/XLC_LOCALE
-%dir %{_x11localedir}/pt_BR.UTF-8
-%{_x11localedir}/pt_BR.UTF-8/Compose
-%{_x11localedir}/pt_BR.UTF-8/XI18N_OBJS
-%{_x11localedir}/pt_BR.UTF-8/XLC_LOCALE
-%dir %{_x11localedir}/tatar-cyr
-%{_x11localedir}/tatar-cyr/Compose
-%{_x11localedir}/tatar-cyr/XI18N_OBJS
-%{_x11localedir}/tatar-cyr/XLC_LOCALE
-%dir %{_x11localedir}/th_TH.UTF-8
-%{_x11localedir}/th_TH.UTF-8/Compose
-%{_x11localedir}/th_TH.UTF-8/XI18N_OBJS
-%{_x11localedir}/th_TH.UTF-8/XLC_LOCALE
-%dir %{_x11localedir}/th_TH
-%{_x11localedir}/th_TH/Compose
-%{_x11localedir}/th_TH/XI18N_OBJS
-%{_x11localedir}/th_TH/XLC_LOCALE
-%dir %{_x11localedir}/tscii-0
-%{_x11localedir}/tscii-0/Compose
-%{_x11localedir}/tscii-0/XI18N_OBJS
-%{_x11localedir}/tscii-0/XLC_LOCALE
-%dir %{_x11localedir}/vi_VN.tcvn
-%{_x11localedir}/vi_VN.tcvn/Compose
-%{_x11localedir}/vi_VN.tcvn/XI18N_OBJS
-%{_x11localedir}/vi_VN.tcvn/XLC_LOCALE
-%dir %{_x11localedir}/vi_VN.viscii
-%{_x11localedir}/vi_VN.viscii/Compose
-%{_x11localedir}/vi_VN.viscii/XI18N_OBJS
-%{_x11localedir}/vi_VN.viscii/XLC_LOCALE
-%dir %{_x11localedir}/zh_CN.UTF-8
-%{_x11localedir}/zh_CN.UTF-8/Compose
-%{_x11localedir}/zh_CN.UTF-8/XI18N_OBJS
-%{_x11localedir}/zh_CN.UTF-8/XLC_LOCALE
-%dir %{_x11localedir}/zh_CN.gb18030
-%{_x11localedir}/zh_CN.gb18030/Compose
-%{_x11localedir}/zh_CN.gb18030/XI18N_OBJS
-%{_x11localedir}/zh_CN.gb18030/XLC_LOCALE
-%dir %{_x11localedir}/zh_CN.gbk
-%{_x11localedir}/zh_CN.gbk/Compose
-%{_x11localedir}/zh_CN.gbk/XI18N_OBJS
-%{_x11localedir}/zh_CN.gbk/XLC_LOCALE
-%dir %{_x11localedir}/zh_CN
-%{_x11localedir}/zh_CN/Compose
-%{_x11localedir}/zh_CN/XI18N_OBJS
-%{_x11localedir}/zh_CN/XLC_LOCALE
-%dir %{_x11localedir}/zh_HK.UTF-8
-%{_x11localedir}/zh_HK.UTF-8/Compose
-%{_x11localedir}/zh_HK.UTF-8/XI18N_OBJS
-%{_x11localedir}/zh_HK.UTF-8/XLC_LOCALE
-%dir %{_x11localedir}/zh_HK.big5
-%{_x11localedir}/zh_HK.big5/Compose
-%{_x11localedir}/zh_HK.big5/XI18N_OBJS
-%{_x11localedir}/zh_HK.big5/XLC_LOCALE
-%dir %{_x11localedir}/zh_HK.big5hkscs
-%{_x11localedir}/zh_HK.big5hkscs/Compose
-%{_x11localedir}/zh_HK.big5hkscs/XI18N_OBJS
-%{_x11localedir}/zh_HK.big5hkscs/XLC_LOCALE
-%dir %{_x11localedir}/zh_TW.UTF-8
-%{_x11localedir}/zh_TW.UTF-8/Compose
-%{_x11localedir}/zh_TW.UTF-8/XI18N_OBJS
-%{_x11localedir}/zh_TW.UTF-8/XLC_LOCALE
-%dir %{_x11localedir}/zh_TW.big5
-%{_x11localedir}/zh_TW.big5/Compose
-%{_x11localedir}/zh_TW.big5/XI18N_OBJS
-%{_x11localedir}/zh_TW.big5/XLC_LOCALE
-%dir %{_x11localedir}/zh_TW
-%{_x11localedir}/zh_TW/Compose
-%{_x11localedir}/zh_TW/XI18N_OBJS
-%{_x11localedir}/zh_TW/XLC_LOCALE
 %dir %{_datadir}/X11
+%dir %{_datadir}/X11/locale
+%dir %{_datadir}/X11/locale/C
+%{_datadir}/X11/locale/C/*
+%dir %{_datadir}/X11/locale/armscii-8
+%{_datadir}/X11/locale/armscii-8/*
+%{_datadir}/X11/locale/compose.dir
+%dir %{_datadir}/X11/locale/en_US.UTF-8
+%{_datadir}/X11/locale/en_US.UTF-8/*
+%dir %{_datadir}/X11/locale/el_GR.UTF-8
+%{_datadir}/X11/locale/el_GR.UTF-8/*
+%dir %{_datadir}/X11/locale/georgian-academy
+%{_datadir}/X11/locale/georgian-academy/*
+%dir %{_datadir}/X11/locale/georgian-ps
+%{_datadir}/X11/locale/georgian-ps/*
+%dir %{_datadir}/X11/locale/ibm-cp1133
+%{_datadir}/X11/locale/ibm-cp1133/*
+%dir %{_datadir}/X11/locale/iscii-dev
+%{_datadir}/X11/locale/iscii-dev/*
+%dir %{_datadir}/X11/locale/isiri-3342
+%{_datadir}/X11/locale/isiri-3342/*
+%dir %{_datadir}/X11/locale/iso8859-*
+%{_datadir}/X11/locale/iso8859-*/*
+%dir %{_datadir}/X11/locale/ja.*
+%{_datadir}/X11/locale/ja.*/*
+%dir %{_datadir}/X11/locale/ja
+%{_datadir}/X11/locale/ja/*
+%dir %{_datadir}/X11/locale/ja_JP.UTF-8
+%{_datadir}/X11/locale/ja_JP.UTF-8/Compose
+%{_datadir}/X11/locale/ja_JP.UTF-8/XI18N_OBJS
+%{_datadir}/X11/locale/ja_JP.UTF-8/XLC_LOCALE
+%dir %{_datadir}/X11/locale/ko
+%{_datadir}/X11/locale/ko/Compose
+%{_datadir}/X11/locale/ko/XI18N_OBJS
+%{_datadir}/X11/locale/ko/XLC_LOCALE
+%dir %{_datadir}/X11/locale/ko_KR.UTF-8
+%{_datadir}/X11/locale/ko_KR.UTF-8/Compose
+%{_datadir}/X11/locale/ko_KR.UTF-8/XI18N_OBJS
+%{_datadir}/X11/locale/ko_KR.UTF-8/XLC_LOCALE
+%dir %{_datadir}/X11/locale/koi8-c
+%{_datadir}/X11/locale/koi8-c/Compose
+%{_datadir}/X11/locale/koi8-c/XI18N_OBJS
+%{_datadir}/X11/locale/koi8-c/XLC_LOCALE
+%dir %{_datadir}/X11/locale/koi8-r
+%{_datadir}/X11/locale/koi8-r/Compose
+%{_datadir}/X11/locale/koi8-r/XI18N_OBJS
+%{_datadir}/X11/locale/koi8-r/XLC_LOCALE
+%dir %{_datadir}/X11/locale/koi8-u
+%{_datadir}/X11/locale/koi8-u/Compose
+%{_datadir}/X11/locale/koi8-u/XI18N_OBJS
+%{_datadir}/X11/locale/koi8-u/XLC_LOCALE
+%{_datadir}/X11/locale/locale.alias
+%{_datadir}/X11/locale/locale.dir
+%dir %{_datadir}/X11/locale/microsoft-*
+%{_datadir}/X11/locale/microsoft-*/*
+%dir %{_datadir}/X11/locale/mulelao-1
+%{_datadir}/X11/locale/mulelao-1/Compose
+%{_datadir}/X11/locale/mulelao-1/XI18N_OBJS
+%{_datadir}/X11/locale/mulelao-1/XLC_LOCALE
+%dir %{_datadir}/X11/locale/nokhchi-1
+%{_datadir}/X11/locale/nokhchi-1/Compose
+%{_datadir}/X11/locale/nokhchi-1/XI18N_OBJS
+%{_datadir}/X11/locale/nokhchi-1/XLC_LOCALE
+%dir %{_datadir}/X11/locale/pt_BR.UTF-8
+%{_datadir}/X11/locale/pt_BR.UTF-8/Compose
+%{_datadir}/X11/locale/pt_BR.UTF-8/XI18N_OBJS
+%{_datadir}/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+%dir %{_datadir}/X11/locale/tatar-cyr
+%{_datadir}/X11/locale/tatar-cyr/Compose
+%{_datadir}/X11/locale/tatar-cyr/XI18N_OBJS
+%{_datadir}/X11/locale/tatar-cyr/XLC_LOCALE
+%dir %{_datadir}/X11/locale/th_TH.UTF-8
+%{_datadir}/X11/locale/th_TH.UTF-8/Compose
+%{_datadir}/X11/locale/th_TH.UTF-8/XI18N_OBJS
+%{_datadir}/X11/locale/th_TH.UTF-8/XLC_LOCALE
+%dir %{_datadir}/X11/locale/th_TH
+%{_datadir}/X11/locale/th_TH/Compose
+%{_datadir}/X11/locale/th_TH/XI18N_OBJS
+%{_datadir}/X11/locale/th_TH/XLC_LOCALE
+%dir %{_datadir}/X11/locale/tscii-0
+%{_datadir}/X11/locale/tscii-0/Compose
+%{_datadir}/X11/locale/tscii-0/XI18N_OBJS
+%{_datadir}/X11/locale/tscii-0/XLC_LOCALE
+%dir %{_datadir}/X11/locale/vi_VN.tcvn
+%{_datadir}/X11/locale/vi_VN.tcvn/Compose
+%{_datadir}/X11/locale/vi_VN.tcvn/XI18N_OBJS
+%{_datadir}/X11/locale/vi_VN.tcvn/XLC_LOCALE
+%dir %{_datadir}/X11/locale/vi_VN.viscii
+%{_datadir}/X11/locale/vi_VN.viscii/Compose
+%{_datadir}/X11/locale/vi_VN.viscii/XI18N_OBJS
+%{_datadir}/X11/locale/vi_VN.viscii/XLC_LOCALE
+%dir %{_datadir}/X11/locale/zh_CN.UTF-8
+%{_datadir}/X11/locale/zh_CN.UTF-8/Compose
+%{_datadir}/X11/locale/zh_CN.UTF-8/XI18N_OBJS
+%{_datadir}/X11/locale/zh_CN.UTF-8/XLC_LOCALE
+%dir %{_datadir}/X11/locale/zh_CN.gb18030
+%{_datadir}/X11/locale/zh_CN.gb18030/Compose
+%{_datadir}/X11/locale/zh_CN.gb18030/XI18N_OBJS
+%{_datadir}/X11/locale/zh_CN.gb18030/XLC_LOCALE
+%dir %{_datadir}/X11/locale/zh_CN.gbk
+%{_datadir}/X11/locale/zh_CN.gbk/Compose
+%{_datadir}/X11/locale/zh_CN.gbk/XI18N_OBJS
+%{_datadir}/X11/locale/zh_CN.gbk/XLC_LOCALE
+%dir %{_datadir}/X11/locale/zh_CN
+%{_datadir}/X11/locale/zh_CN/Compose
+%{_datadir}/X11/locale/zh_CN/XI18N_OBJS
+%{_datadir}/X11/locale/zh_CN/XLC_LOCALE
+%dir %{_datadir}/X11/locale/zh_HK.UTF-8
+%{_datadir}/X11/locale/zh_HK.UTF-8/Compose
+%{_datadir}/X11/locale/zh_HK.UTF-8/XI18N_OBJS
+%{_datadir}/X11/locale/zh_HK.UTF-8/XLC_LOCALE
+%dir %{_datadir}/X11/locale/zh_HK.big5
+%{_datadir}/X11/locale/zh_HK.big5/Compose
+%{_datadir}/X11/locale/zh_HK.big5/XI18N_OBJS
+%{_datadir}/X11/locale/zh_HK.big5/XLC_LOCALE
+%dir %{_datadir}/X11/locale/zh_HK.big5hkscs
+%{_datadir}/X11/locale/zh_HK.big5hkscs/Compose
+%{_datadir}/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
+%{_datadir}/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
+%dir %{_datadir}/X11/locale/zh_TW.UTF-8
+%{_datadir}/X11/locale/zh_TW.UTF-8/Compose
+%{_datadir}/X11/locale/zh_TW.UTF-8/XI18N_OBJS
+%{_datadir}/X11/locale/zh_TW.UTF-8/XLC_LOCALE
+%dir %{_datadir}/X11/locale/zh_TW.big5
+%{_datadir}/X11/locale/zh_TW.big5/Compose
+%{_datadir}/X11/locale/zh_TW.big5/XI18N_OBJS
+%{_datadir}/X11/locale/zh_TW.big5/XLC_LOCALE
+%dir %{_datadir}/X11/locale/zh_TW
+%{_datadir}/X11/locale/zh_TW/Compose
+%{_datadir}/X11/locale/zh_TW/XI18N_OBJS
+%{_datadir}/X11/locale/zh_TW/XLC_LOCALE
 %{_datadir}/X11/XErrorDB
 %{_datadir}/X11/XKeysymDB
 %dir %{_libdir}
@@ -236,6 +235,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3x/*.3x*
 
 %changelog
+* Tue Nov 22 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-4
+- Added libX11-0.99.3-datadir-locale-dir-fix.patch, to fix build to install
+  the locale data files into datadir instead of libdir.
+
 * Mon Nov 14 2005 Jeremy Katz <katzj@redhat.com> - 0.99.3-3
 - require newer filesystem package (#172610)