diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 9a827ef..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-cyrus-imapd-2.3.16.tar.gz
-cyrus_sharedbackup-0.1.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9a827ef
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+cyrus-imapd-2.3.16.tar.gz
+cyrus_sharedbackup-0.1.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 6779a72..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: cyrus-imapd
-# $Id$
-NAME := cyrus-imapd
-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),)
-# 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/branch b/branch
deleted file mode 100644
index 06de2d2..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-12