diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 0d52318..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-xkbevd-1.0.2.tar.bz2
-xkbprint-1.0.1.tar.bz2
-xkbutils-1.0.1.tar.bz2
-xkbcomp-1.1.0.tar.bz2
-setxkbmap-1.1.0.tar.bz2
-xkbcomp-1.1.1.tar.bz2
-xkbevd-1.1.0.tar.bz2
-xkbutils-1.0.2.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0d52318
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+xkbevd-1.0.2.tar.bz2
+xkbprint-1.0.1.tar.bz2
+xkbutils-1.0.1.tar.bz2
+xkbcomp-1.1.0.tar.bz2
+setxkbmap-1.1.0.tar.bz2
+xkbcomp-1.1.1.tar.bz2
+xkbevd-1.1.0.tar.bz2
+xkbutils-1.0.2.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index a38395a..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xorg-x11-xkb-utils
-# $Id: Makefile,v 1.2 2007/10/15 19:38:00 notting Exp $
-NAME := xorg-x11-xkb-utils
-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/branch b/branch
deleted file mode 100644
index baa94ef..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-13