diff --git a/.cvsignore b/.cvsignore
index 22c3137..db7f2be 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libXext-0.99.1.tar.bz2
+libXext-0.99.2.tar.bz2
diff --git a/libXext.spec b/libXext.spec
index 0f59ac7..c1d9cb0 100644
--- a/libXext.spec
+++ b/libXext.spec
@@ -1,6 +1,6 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
-Version: 0.99.1
+Version: 0.99.2
 Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
@@ -12,7 +12,7 @@ BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXau-devel
 
-Conflicts: XFree86-libs, xorg-x11-libs
+Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
 X.Org X11 libXext runtime library
@@ -22,7 +22,7 @@ Summary: X.Org X11 libXext development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Conflicts: XFree86-devel, xorg-x11-devel
+Obsoletes: XFree86-devel, xorg-x11-devel
 
 %description devel
 X.Org X11 libXext development package
@@ -125,6 +125,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3x/XmbufQueryExtension.3x*
 
 %changelog
+* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1
+- Updated libXext to version 0.99.2 from X11R7 RC2
+- Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
+- Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
+
+
 * Fri Oct 21 2005 Mike A. Harris <mharris.com> 0.99.1-1
 - Updated to libXext-0.99.1 from the X11R7 RC1 release.
 - Added manpages that were absent in X11R7 RC0, and updated the file lists
diff --git a/sources b/sources
index 7ba5aa5..b99ea11 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-30d1c7c035b059fca09ac3c0c1505a2f  libXext-0.99.1.tar.bz2
+03cfe5664067312b9b398891e40deb46  libXext-0.99.2.tar.bz2