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 bf9fcbd..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: abe
-# $Id$
-NAME := abe
-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/abe.spec b/abe.spec
index 938476b..6b0c3fe 100644
--- a/abe.spec
+++ b/abe.spec
@@ -1,12 +1,12 @@
 Name:           abe
 Version:        1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Scrolling, platform-jumping, ancient pyramid exploring game
 Group:          Amusements/Games
-License:        GPL
+License:        GPL+
 URL:            http://abe.sourceforge.net/
-Source0:        http://dl.sourceforge.net/abe/abe-1.1.tar.gz
+Source0:        http://downloads.sourceforge.net/abe/abe-%{version}.tar.gz
 Source1:        %{name}.png
 Patch0:		abe-1.1-settings.patch
 
@@ -47,7 +47,7 @@ Icon=abe.png
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Game;Application;X-Fedora;
+Categories=Game;ArcadeGame;
 EOF
 
 desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.desktop
@@ -60,12 +60,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 
 %changelog
+- License tag clarification
+- Simplify %%file section
+
+* Fri Jun 1 2007 Wart <wart@kobold.org> 1.1-5
+- Update desktop category for better game menu integration
+- Use improved download URL.
+
 * Thu Aug 31 2006 Wart <wart@kobold.org> 1.1-4
 - Add missing BuildRequires