diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index b3e81d6..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-apr-util-1.3.9.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b3e81d6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+apr-util-1.3.9.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 0a1bc48..0000000
--- a/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Makefile for source rpm: apr-util
-# $Id$
-NAME := apr-util
-SPECFILE = $(firstword $(wildcard *.spec))
-UPSTREAM_CHECKS = asc
-
-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)