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 5f410c6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: vdrift-data
-# $Id$
-NAME := vdrift-data
-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/dead.package b/dead.package
new file mode 100644
index 0000000..13192ac
--- /dev/null
+++ b/dead.package
@@ -0,0 +1,5 @@
+Merged into the main vdrift package, mirroring upstream's merge of source
+and data into one .bz2.  Effective at rpm version 20080805-1.
+
+Jon Ciesla
+8/13/2008
diff --git a/sources b/sources
deleted file mode 100644
index 8e25c09..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-51b2f6d941ddf334a7be9232c1b19bb2  vdrift-2007-12-26-data.zip
diff --git a/vdrift-data.spec b/vdrift-data.spec
deleted file mode 100644
index ef0682e..0000000
--- a/vdrift-data.spec
+++ /dev/null
@@ -1,53 +0,0 @@
-Name: vdrift-data
-Version:  20071226
-Release:  3%{?dist}
-Summary: VDrift data set
-
-Group: Amusements/Games 
-License: GPLv2+
-URL: http://vdrift.net
-Source0: http://downloads.sourceforge.net/vdrift/vdrift-2007-12-26-data.zip
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
-BuildArch: noarch
-
-Requires: vdrift = %{version}
-
-%description
-VDrift is a cross-platform, open source driving simulation made with drift 
-racing in mind. It's powered by the excellent Vamos physics engine. It is
-released under the GNU General Public License (GPL) v2. It is currently
-available for Linux, FreeBSD, Mac OS X and Windows (Cygwin).
-
-This package provides the data set.
-
-%prep
-
-%setup -qn data
-
-%build
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_datadir}/vdrift
-cp -pr * %{buildroot}%{_datadir}/vdrift
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%doc README
-%{_datadir}/vdrift/
-
-%changelog
-* Mon Apr 14 2008 Jesse Keating <jkeating@redhat.com> - 20071226-3
-- Rebuild due to buildsystem corruption
-
-* Thu Feb 14 2008 Jon Ciesla <limb@jcomserv.net> - 20071226-2
-- Multiple package fixes.
-
-* Tue Feb 12 2008 Jon Ciesla <limb@jcomserv.net> - 20071226-1
-- New upstream version.
-
-* Mon Apr 04 2007 Jon Ciesla <limb@jcomserv.net> - 20070323-1
-- Initial packaging