diff --git a/.cvsignore b/.cvsignore
index 2a18bf4..7bdb643 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Acetoneiso_2.0.3.2.tar.gz
+acetoneiso_2.0.4.tar.gz
diff --git a/AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch b/AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch
index 451f9dc..f22c1cd 100644
--- a/AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch
+++ b/AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch
@@ -1,6 +1,6 @@
-diff -up acetoneiso_2.0.3/src/sources/converter.h.BAD acetoneiso_2.0.3/src/sources/converter.h
---- acetoneiso_2.0.3/sources/converter.h.BAD	2009-04-09 09:50:31.000000000 -0400
-+++ acetoneiso_2.0.3/sources/converter.h	2009-04-09 09:51:03.000000000 -0400
+diff -up acetoneiso_2.0.4/acetoneiso/src/sources/converter.h.BAD acetoneiso_2.0.4/acetoneiso/src/sources/converter.h
+--- acetoneiso_2.0.4/acetoneiso/sources/converter.h.BAD	2009-04-09 09:50:31.000000000 -0400
++++ acetoneiso_2.0.4/acetoneiso/sources/converter.h	2009-04-09 09:51:03.000000000 -0400
 @@ -125,6 +125,7 @@ else {
  void acetoneiso::get_poweriso()
  {
diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec
index 117ff8f..1893836 100644
--- a/AcetoneISO2.spec
+++ b/AcetoneISO2.spec
@@ -1,11 +1,11 @@
 Name:		AcetoneISO2
-Version:	2.0.3.2
-Release:	3%{?dist}
+Version:	2.0.4
+Release:	1%{?dist}
 Summary:	CD/DVD Image Manipulator
 Group:		Applications/Archiving
 License:	GPLv3
 URL:		http://www.acetoneteam.org/
-Source0:	http://download.sourceforge.net/sourceforge/acetoneiso2/Acetoneiso_%{version}.tar.gz
+Source0:	http://download.sourceforge.net/sourceforge/acetoneiso2/acetoneiso_%{version}.tar.gz
 Patch0:		acetoneiso2-2.0.3.2-desktop.patch
 Patch1:		AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,16 +31,18 @@ AcetoneISO2: The CD/DVD image manipulator for Linux, it can do the following:
 - Restore a lost CUE file of *.bin *.img
 
 %prep
-%setup -q -n Acetoneiso_%{version}
+%setup -q -n acetoneiso_%{version}
 %patch0 -p1
 %patch1 -p1
 
 %build
+cd acetoneiso
 qmake-qt4
 make %{?_smp_mflags} LFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT 
+cd acetoneiso
 make INSTALL_ROOT=$RPM_BUILD_ROOT install
 mv $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO.desktop $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO2.desktop
 mv $RPM_BUILD_ROOT%{_bindir}/acetoneiso $RPM_BUILD_ROOT%{_bindir}/acetoneiso2
@@ -64,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/Acetino2.png
 
 %changelog
+* Mon Aug 31 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.0.4-1
+- Update to 2.0.4
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/acetoneiso2-2.0.3.2-desktop.patch b/acetoneiso2-2.0.3.2-desktop.patch
index a9ef1a8..edae393 100644
--- a/acetoneiso2-2.0.3.2-desktop.patch
+++ b/acetoneiso2-2.0.3.2-desktop.patch
@@ -1,6 +1,6 @@
-diff -up Acetoneiso_2.0.3.2/menu/AcetoneISO.desktop.BAD Acetoneiso_2.0.3.2/menu/AcetoneISO.desktop
---- Acetoneiso_2.0.3.2/menu/AcetoneISO.desktop.BAD	2009-07-23 18:30:22.496042966 -0400
-+++ Acetoneiso_2.0.3.2/menu/AcetoneISO.desktop	2009-07-23 18:30:43.351041731 -0400
+diff -up acetoneiso_2.0.4/acetoneiso/menu/AcetoneISO.desktop.BAD acetoneiso_2.0.4/acetoneiso/menu/AcetoneISO.desktop
+--- acetoneiso_2.0.4/acetoneiso/menu/AcetoneISO.desktop.BAD	2009-07-23 18:30:22.496042966 -0400
++++ acetoneiso_2.0.4/acetoneiso/menu/AcetoneISO.desktop	2009-07-23 18:30:43.351041731 -0400
 @@ -2,9 +2,9 @@
  Categories=Qt;KDE;Application;AudioVideo;DiscBurning;
  Encoding=UTF-8
diff --git a/sources b/sources
index 4f84822..22523a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4d6724e134280f8d1b92f4b9fb1579f7  Acetoneiso_2.0.3.2.tar.gz
+e0036a7a756e4d7e4a1fa8f666c25389  acetoneiso_2.0.4.tar.gz