diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/AcetoneISO2.spec b/AcetoneISO2.spec
index 66f1643..0b2f6c0 100644
--- a/AcetoneISO2.spec
+++ b/AcetoneISO2.spec
@@ -1,15 +1,19 @@
 Name:		AcetoneISO2
-Version:	2.2.1
-Release:	2%{?dist}
+Version:	2.3
+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
-Patch0:		acetoneiso2-2.0.3.2-desktop.patch
+Source0:	http://download.sourceforge.net/sourceforge/acetoneiso/acetoneiso_%{version}.tar.gz
 Patch1:		AcetoneISO2-2.0.3-no-poweriso-for-non-x86.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	kdewebdev-devel, qt4-devel, desktop-file-utils
+BuildRequires:	kdewebdev-devel, desktop-file-utils
+%if 0%{?fedora} > 13
+BuildRequires:	qt-webkit-devel
+%else
+BuildRequires:	qt4-devel
+%endif
 BuildRequires:	phonon-devel
 Requires:	p7zip, cdrdao
 Requires:	fuseiso, fuse, genisoimage
@@ -33,7 +37,6 @@ AcetoneISO2: The CD/DVD image manipulator for Linux, it can do the following:
 
 %prep
 %setup -q -n acetoneiso_%{version}
-%patch0 -p1
 %patch1 -p1
 
 %build
@@ -49,6 +52,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO.desktop $RPM_BUILD_ROOT%{_
 mv $RPM_BUILD_ROOT%{_bindir}/acetoneiso $RPM_BUILD_ROOT%{_bindir}/acetoneiso2
 
 sed -i 's|Exec=acetoneiso|Exec=acetoneiso2|g' $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO2.desktop
+sed -i 's|Name=AcetoneISO|Name=AcetoneISO2|g' $RPM_BUILD_ROOT%{_datadir}/applications/AcetoneISO2.desktop
 
 desktop-file-install --vendor ""			\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
@@ -67,6 +71,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/Acetino2.png
 
 %changelog
+* Thu Nov 18 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2.3-1
+- update to 2.3
+
+* Mon Jun 28 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2.2.2-2
+- fix qt buildrequires
+
+* Mon Jun 28 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2.2.2-1
+- update to 2.2.2
+
 * Tue Nov 24 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 2.2.1-2
 - rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
 
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7a648d2..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: AcetoneISO2
-# $Id: Makefile,v 1.1 2008/04/09 15:36:15 spot Exp $
-NAME := AcetoneISO2
-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 $$d/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 773cecb..8e3076e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c4891fb1ddfe9d3dff4b55e8ea27ed29  acetoneiso_2.2.1.tar.gz
+225f7af687016690ff28b9771a1ce179  acetoneiso_2.3.tar.gz