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 9262966..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: alienarena-data
-# $Id$
-NAME := alienarena-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/alienarena-data.spec b/alienarena-data.spec
index 539c1c0..2c19b9b 100644
--- a/alienarena-data.spec
+++ b/alienarena-data.spec
@@ -1,55 +1,63 @@
 Name:		alienarena-data
-Summary: 	Data files for Alien Arena 2007
-Version:	20071011
-Release:	2%{?dist}
+Summary: 	Data files for Alien Arena 2008
+Version:	20090115
+Release:	1%{?dist}
 License:	Redistributable, no modification permitted
 Group:		Amusements/Games
-# Upstream has prebuilt binaries in it. We pull those out and bzip2.
-# Source0:	http://icculus.org/alienarena/files/alienarena2007-20071011-linux.zip
-Source0:	alienarena2007-20071011-data.tar.bz2
-URL:		http://icculus.org/alienarena/files/
+URL:		http://icculus.org/alienarena/
+# We need to get this from SVN
+#   mkdir alienarena-data-20090115 && cd alienarena-data-20090115
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/arena
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/botinfo
+#   svn co svn://svn.icculus.org/alienarena/tags/7.21/data1
+#   cd ../
+#   find alienarena-20090115 -depth -name .svn -type d -exec rm -rf {} \;
+#   tar -cvjf alienarena-data-20090115.tar.bz2 alienarena-data-20090115
+Source0:	%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
-Requires:	alienarena >= 6.10
+
 
 %description
-Data files (audio, maps, etc) for Alien Arena 2007.
+Data files (audio, maps, etc) for Alien Arena 2008.
+
 
 %prep
-%setup -q -n alienarena2007
+%setup -q
+rm -f {arena,data1}/game.so
+
 
 %build
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/alienarena/
-cp -ap * $RPM_BUILD_ROOT%{_datadir}/alienarena/
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/
-mv $RPM_BUILD_ROOT%{_datadir}/alienarena/aa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/
-rm -f $RPM_BUILD_ROOT%{_datadir}/alienarena/Aa.ico
-rm -rf $RPM_BUILD_ROOT%{_datadir}/alienarena/Tools/
+rm -rf %{buildroot}
+%{__mkdir_p} %{buildroot}/%{_datadir}/alienarena/
+cp -ap arena botinfo data1 %{buildroot}/%{_datadir}/alienarena/
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_datadir}/alienarena/
-%{_datadir}/icons/hicolor/32x32/apps/aa.png
 
 %changelog
+* Fri Jan 30 2009 Tom "spot" Callaway <tcallawa@redhat.com> 20090115-1
+- update to 20090115 (7.21)
+
+* Mon Oct 20 2008 Tom "spot" Callaway <tcallawa@redhat.com> 20081016-1
+- update to 20081016
+- sync up with Paul Bredbury's spec
+
+* Thu Jul  3 2008 Tom "spot" Callaway <tcallawa@redhat.com> 20080603-2
+- get rid of prebuilt so file
+
+* Wed Jul  2 2008 Tom "spot" Callaway <tcallawa@redhat.com> 20080603-1
+- update to 2008 data
+
 * Tue Nov 27 2007 Tom "spot" Callaway <tcallawa@redhat.com> 20071011-2
 - cleanups, move icon into hicolor tree
 
diff --git a/sources b/sources
index 1b52493..bb6a855 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fda681b0a121f904e7079adc4b7222f7  alienarena2007-20071011-data.tar.bz2
+85fcf79affa2ac14a7d1983cf02990fd  alienarena-data-20090115.tar.bz2