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 26fa128..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: ularn
-# $Id$
-NAME := ularn
-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/ularn.desktop b/ularn.desktop
index 0bb3ce5..6f870fb 100644
--- a/ularn.desktop
+++ b/ularn.desktop
@@ -7,5 +7,5 @@ Exec=Ularn
 Icon=ularn.png
 Terminal=true
 Type=Application
-Categories=Application;Game;
+Categories=Game;RolePlaying;
 Version=1.5p4
diff --git a/ularn.spec b/ularn.spec
index 27da618..1ae9912 100644
--- a/ularn.spec
+++ b/ularn.spec
@@ -1,12 +1,12 @@
 Name:           ularn
 Version:        1.5p4
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:        Simple roguelike game
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPL+
 URL:            http://www.ularn.org
-Source0:        http://www.ularn.org/Ularn-1.5ishPL4.tar.gz
+Source0:        http://downloads.sourceforge.net/ularn/Ularn-1.5ishPL4.tar.gz
 Source1:        config.sh.in
 Source2:        ularn.desktop
 Source3:        ularn.png
@@ -59,7 +59,6 @@ touch $RPM_BUILD_ROOT/%{_var}/games/Ularn-scoreboard
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         %{SOURCE2}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
@@ -92,6 +91,12 @@ fi
 
 
 %changelog
+- License tag clarification
+
+* Sat Mar 3 2007 Wart <wart at kobold.org> 1.5p4-8
+- Update .desktop file categories
+- Use new upstream file location at Sourceforge
+
 * Mon Aug 28 2006 Wart <wart at kobold.org> 1.5p4-7
 - Fixed BR: ncurses -> ncurses-devel