diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 1bf53c8..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-wormux-0.8.2.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4521d44
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+wormux-0.8.4.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index e98eb66..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wormux
-# $Id$
-NAME := wormux
-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/sources b/sources
index b6cd8c8..5e905b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd0f22e6055acebfa5871e86ca229ee8  wormux-0.8.2.tar.bz2
+0aed316799723173f2d6e242af312382  wormux-0.8.4.tar.bz2
diff --git a/wormux-0.8.3-cflags.patch b/wormux-0.8.3-cflags.patch
new file mode 100644
index 0000000..6dfd262
--- /dev/null
+++ b/wormux-0.8.3-cflags.patch
@@ -0,0 +1,11 @@
+diff -up wormux-0.8.3/configure~ wormux-0.8.3/configure
+--- wormux-0.8.3/configure~	2009-03-05 22:24:17.000000000 +0200
++++ wormux-0.8.3/configure	2009-05-07 20:41:31.000000000 +0300
+@@ -7608,6 +7608,7 @@ echo "${ECHO_T}$gccver" >&6; }
+     GCC_FLAGS="$GCC_FLAGS -DWMX_LOG"
+   fi
+ 
++   GCC_FLAGS="$GCC_FLAGS $CFLAGS"
+       CFLAGS="$GCC_FLAGS"
+     CXXFLAGS="$GCC_FLAGS"
+ 
diff --git a/wormux.spec b/wormux.spec
index f13e596..e8af3fe 100644
--- a/wormux.spec
+++ b/wormux.spec
@@ -1,12 +1,13 @@
 Name:           wormux
-Version:        0.8.2
-Release:        5%{?dist}
+Version:        0.8.4
+Release:        1%{?dist}
 Summary:        2D convivial mass murder game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.wormux.org
 Source0:        http://download.gna.org/wormux/%{name}-%{version}.tar.bz2
+Patch0:         wormux-0.8.3-cflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_image-devel SDL_gfx-devel SDL_mixer-devel
@@ -27,12 +28,17 @@ destroy all of your opponents' mascots.
 Summary: Data files for wormux
 Group: Amusements/Games
 Requires: %{name} = %{version}
+BuildArch: noarch
 %description data
 Data files for wormux
 
 %prep
 %setup -q
+%patch0 -p1
 
+# Remove a backup file
+rm -f data/game_mode/rope_objects.xml~
+rm -f data/game_mode/skin_viewer.xml~
 
 %build
 %configure --disable-nls --disable-dependency-tracking
@@ -79,6 +85,8 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog
 %{_bindir}/%{name}
+%{_bindir}/%{name}-index-server
+%{_bindir}/%{name}-server
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_datadir}/pixmaps/wormux*.png
@@ -89,6 +97,14 @@ fi
 %{_datadir}/%{name}
 
 %changelog
+* Wed Jul 18 2009 Wart <wart@kobold.org> 0.8.4-1
+- Update to 0.8.4
+- Build with $RPM_OPT_FLAGS.
+
+* Wed May 6 2009 Wart <wart@kobold.org> 0.8.3-1
+- Update to 0.8.3
+- Make -data subpackage noarch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild