diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index eda53ec..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: libXcursor
-# $Id: Makefile,v 1.2 2007/10/15 18:57:50 notting Exp $
-NAME := libXcursor
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/index.theme b/index.theme
index 08055f7..6eed8fe 100644
--- a/index.theme
+++ b/index.theme
@@ -1,2 +1,2 @@
 [Icon Theme]
-Inherits=Bluecurve
+Inherits=dmz-aa
diff --git a/libXcursor.spec b/libXcursor.spec
index 0c4e7c8..cfad508 100644
--- a/libXcursor.spec
+++ b/libXcursor.spec
@@ -1,14 +1,15 @@
-Summary: Cursor management library 
+Summary: Cursor management library
 Name: libXcursor
 Version: 1.1.10
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+#VCS: git:git://anongit.freedesktop.org/xorg/lib/libXcursor
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 Source1: index.theme
+# the default cursor theme inherits from this
+Requires: dmz-cursor-themes
 
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
@@ -20,7 +21,7 @@ BuildRequires: libXrender-devel >= 0.8.2
 %description
 This is  a simple library designed to help locate and load cursors.
 Cursors can be loaded from files or memory. A library of common cursors
-exists which map to the standard X cursor names.Cursors can exist in 
+exists which map to the standard X cursor names.Cursors can exist in
 several sizes and the library automatically picks the best size.
 
 %package devel
@@ -72,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXcursor.so.1
 %{_libdir}/libXcursor.so.1.0.2
 %dir %{_datadir}/icons/default
-%config(noreplace) %verify(not md5 size mtime) %{_datadir}/icons/default/index.theme
+%{_datadir}/icons/default/index.theme
 
 %files devel
 %defattr(-,root,root,-)
@@ -87,6 +88,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Xcursor*.3*
 
 %changelog
+* Thu Mar 11 2010 Matthias Clasen <mclasen@redhat.com> - 1.1.10-5
+- The theme file should _not_ be a config file
+
+* Tue Mar  9 2010 Matthias Clasen <mclasen@redhat.com> - 1.1.10-4
+- Make default cursor theme inherit dmz-aa instead of Bluecurve
+- Also require the cursor theme package
+
 * Wed Oct 21 2009 Parag <paragn@fedoraproject.org> - 1.1.10-3
 - Merge-Review #226066
 - make is not verbose