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 c5cea9f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xosd
-# $Id$
-NAME := xosd
-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 $$/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),)
-# attept 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/xosd.spec b/xosd.spec
index 037c4d5..62fcd8e 100644
--- a/xosd.spec
+++ b/xosd.spec
@@ -4,11 +4,11 @@
 
 Name:           xosd
 Version:        2.2.14
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        On-screen display library for X
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://www.ignavus.net/software.html
 Source:         http://ftp.debian.org/debian/pool/main/x/xosd/%{name}_%{version}.orig.tar.gz
 Patch0:         %{name}-aclocal18.patch
@@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xmms_plugdir}/libxmms_osd.so
 
 %changelog
+* Sun Aug 26 2007 Kevin Fenzi <kevin@tummy.com> - 2.2.14-10
+- Update License tag
+
 * Tue Feb 27 2007 Kevin Fenzi <kevin@tummy.com> - 2.2.14-9
 - Remove bmp subpackage, as bmp is no longer shipped.