diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index f6f12ea..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-wormux-0.7.4.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b08c6c5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+wormux-0.7.9.tar.gz
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 9492ee5..19e3015 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-271de7da072bc4e8c023f55e85a42eb0  wormux-0.7.4.tar.gz
+d921ae5bad243dec7bb6825d6e0b9d16  wormux-0.7.9.tar.gz
diff --git a/wormux.spec b/wormux.spec
index 391af4e..e353d1d 100644
--- a/wormux.spec
+++ b/wormux.spec
@@ -1,17 +1,16 @@
 Name:           wormux
-Version:        0.7.4
-Release:        1%{?dist}
+Version:        0.7.9
+Release:        3%{?dist}
 Summary:        2D convivial mass murder game
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://www.wormux.org
 Source0:        http://download.gna.org/wormux/%{name}-%{version}.tar.gz
-Source1:        %{name}.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_image-devel SDL_gfx-devel SDL_mixer-devel 
-BuildRequires:  SDL_ttf-devel SDL_net-devel
+BuildRequires:  SDL_ttf-devel SDL_net-devel curl-devel
 BuildRequires:  gettext libxml++-devel desktop-file-utils
 Requires:       wormux-data
 
@@ -42,25 +41,18 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-cat << EOF > %{name}.desktop
-[Desktop Entry]
-Encoding=UTF-8
-Name=wormux
-Comment=Kill 'em all game
-Exec=wormux
-Icon=wormux.png
-Terminal=false
-Categories=Application;Game;ArcadeGame;
-Type=Application
-EOF
-
+sed -i -e 's/Icon=.*/Icon=wormux.png/' \
+        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor fedora \
         --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \
-        --add-category X-Fedora \
-        %{name}.desktop
+        --remove-category=Application \
+        --remove-category=ArcadeGame \
+        --add-category=StrategyGame \
+        --delete-original \
+        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-install -d $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+install -d $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
+install -p -m 644 data/%{name}_32x32.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,7 +75,7 @@ fi
 %doc AUTHORS COPYING ChangeLog
 %{_bindir}/%{name}
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_mandir}/man6/*.6.gz
 
 %files data
@@ -91,6 +83,15 @@ fi
 %{_datadir}/%{name}
 
 %changelog
+- License tag clarification
+
+* Fri Mar 9 2007 Wart <wart@kobold.org> 0.7.9-2
+- Clean up desktop file categories
+- Use upstream's desktop file and icon
+
+* Sat Feb 17 2007 Wart <wart@kobold.org> 0.7.9-1
+- Update to 0.7.9
+
 * Fri Sep 1 2006 Wart <wart@kobold.org> 0.7.4-1
 - Update to 0.7.4