diff --git a/.cvsignore b/.cvsignore
index cb6606b..5cc685c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libXcursor-1.1.4.tar.bz2
+libXcursor-1.1.5.tar.bz2
diff --git a/libXcursor.spec b/libXcursor.spec
index b52da28..c200480 100644
--- a/libXcursor.spec
+++ b/libXcursor.spec
@@ -1,7 +1,7 @@
 
 Summary: X.Org X11 libXcursor runtime library
 Name: libXcursor
-Version: 1.1.4
+Version: 1.1.5
 Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
@@ -14,7 +14,7 @@ BuildRequires: libXfixes-devel
 BuildRequires: libXrender-devel >= 0.8.2
 
 
-Conflicts: XFree86-libs, xorg-x11-libs
+Obsoletes: XFree86-libs, xorg-x11-libs
 
 %description
 X.Org X11 libXcursor runtime library
@@ -25,7 +25,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 libXcursor development package
@@ -81,6 +81,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Xcursor.3.gz
 
 %changelog
+* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 1.1.5-1
+- Updated libXcursor to version 1.1.5 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> 1.1.4-1
 - Updated libXcursor to version 1.1.4 from X11R7 RC1
 
diff --git a/sources b/sources
index 825fcc2..de6f0cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03f7acb72e62939a5e5289b0001d39e8  libXcursor-1.1.4.tar.bz2
+c90f04967c0b68dbde0dd6f4dc943877  libXcursor-1.1.5.tar.bz2