diff --git a/.cvsignore b/.cvsignore
index af01924..e055bc9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 libX11-1.0.1.tar.bz2
+libX11-1.0.2.tar.bz2
diff --git a/libX11.spec b/libX11.spec
index 6813344..2ebf986 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
-Version: 1.0.1
-Release: 3
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -13,14 +13,12 @@ Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
 Patch1: libX11-1.0.1-setuid.diff
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-proto-devel
+# xproto >= 7.0.6 required
+BuildRequires: xorg-x11-proto-devel >= 7.1-2
 BuildRequires: xorg-x11-xtrans-devel
 BuildRequires: libXau-devel
 BuildRequires: libXdmcp-devel
 
-# NOTE: Temporary BuildRequires needed for build time kludges.
-BuildRequires: autoconf
-
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
 Obsoletes: XFree86-libs, xorg-x11-libs
@@ -34,7 +32,8 @@ Group: Development/Libraries
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
 
-Requires: xorg-x11-proto-devel
+# xproto >= 7.0.6 required
+Requires: xorg-x11-proto-devel >= 7.1-2
 Requires: libXau-devel, libXdmcp-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
@@ -44,16 +43,20 @@ X.Org X11 libX11 development package
 
 %prep
 %setup -q
-%patch0 -p0 -b .datadir-locale-dir-fix
+# FIXME: We are keeping this around, as upstream has a tendency for random
+# people to revert fixes other people have applied, and have a 6-8 month tug
+# of war with these things.  It's easier to leave this here than to try and
+# find it later.
+#%patch0 -p0 -b .datadir-locale-dir-fix
+
+# FIXME: For some reason, upstream supplies this patch, but hasn't checked it
+# into CVS/git/whatever yet it seems, so upstream is potentially insecure.
 %patch1 -p1 -b .setuid
 
 # 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}
@@ -241,6 +244,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jun 28 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-1
+- Updated libX11 to version 1.0.2
+- Bump BuildRequires and Requires to "xorg-x11-proto-devel >= 7.1-2" to meet
+  new "xproto >= 7.0.6" dependency.
+- Disable libX11-0.99.3-datadir-locale-dir-fix.patch as it is now included
+  upstream.
+- Remove autoconf dependency as we no longer need it.
+
 * Tue Jun 20 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-3
 - Added libX11-1.0.1-setuid.diff to fix potential security issue (#196094)
 - Change dependency on "filesystem" package to "xorg-x11-filesystem" package,
diff --git a/sources b/sources
index 8542d07..1b7103f 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 58f0537f21183e27149cf906a1b6bef9  libX11-1.0.1.tar.bz2
+86a16bdc09b42b2e018dd665c23ca21c  libX11-1.0.2.tar.bz2