diff --git a/.cvsignore b/.cvsignore
index 7b63451..d38cb0f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libfontenc-0.99.1.tar.bz2
+libfontenc-0.99.2.tar.bz2
diff --git a/libfontenc.spec b/libfontenc.spec
index 19d6eb3..7ef1df0 100644
--- a/libfontenc.spec
+++ b/libfontenc.spec
@@ -1,6 +1,6 @@
 Summary: X.Org X11 libfontenc runtime library
 Name: libfontenc
-Version: 0.99.1
+Version: 0.99.2
 Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
@@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: zlib-devel
 
-Conflicts: XFree86-libs, xorg-x11-libs
+Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
 X.Org X11 libfontenc runtime library
@@ -22,7 +22,7 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 
-Conflicts: XFree86-devel, xorg-x11-devel
+Obsoletes: XFree86-devel, xorg-x11-devel
 
 %description devel
 X.Org X11 libfontenc development package
@@ -75,6 +75,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/fontenc.pc
 
 %changelog
+* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1
+- Updated libfontenc 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'
+
+
 * Mon Oct 24 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-1
 - Updated libfontenc to version 0.99.1 from X11R7 RC1
 
diff --git a/sources b/sources
index e4462e9..279e4ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-647781388349024497d3137336ab9259  libfontenc-0.99.1.tar.bz2
+a7c443ff074683c62c6e064a238aef15  libfontenc-0.99.2.tar.bz2