diff --git a/.cvsignore b/.cvsignore
index 57caa6b..65a1b82 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nazghul-0.5.6.tar.gz
+nazghul_0_6_0.tar.gz
diff --git a/nazghul.spec b/nazghul.spec
index c7d4b25..96f9bfa 100644
--- a/nazghul.spec
+++ b/nazghul.spec
@@ -1,13 +1,17 @@
 Name:           nazghul
-Version:        0.5.6
-Release:        4%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 Summary:        A computer role-playing game (CRPG) engine
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://myweb.cableone.net/gmcnutt/nazghul.html
 
-Source0:        http://dl.sourceforge.net/nazghul/nazghul-%{version}.tar.gz
+%define         version_us %(echo %{version} | sed -e 's/\\./_/g')
+
+# Upstream has gone mildly insane
+#Source0:        http://dl.sourceforge.net/nazghul/nazghul-%{version}.tar.gz
+Source0:        http://easynews.dl.sourceforge.net/%{name}/%{name}_%{version_us}.tar.gz
 Patch0:         nazghul-desktop.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,7 +36,8 @@ You must install Nazghul in order to play Haxima.
 
 
 %prep
-%setup -q
+# More upstream insanity
+%setup -q -n %{name}_%{version_us}
 %patch0
 
 # clean up CVS directories left in the source tarball
@@ -85,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 05 2007 Jason L Tibbitts III <tibbs@math.uh.edu> - 0.6.0-1
+- Update to 0.6.0.
+
 * Wed Aug 22 2007 Jason L Tibbitts III <tibbs@math.uh.edu> - 0.5.6-4
 - Patch upstream .desktop file for proper use of Version.
 - Remove some errant CVS directories.
diff --git a/sources b/sources
index 246c1e4..da53ada 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b2c6e869acba048c23c8b5cb83a8170  nazghul-0.5.6.tar.gz
+9535f569ac61893f7d5e8cfa93f99df0  nazghul_0_6_0.tar.gz