diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/AcetoneISO.spec b/AcetoneISO.spec
new file mode 100644
index 0000000..8bb2de0
--- /dev/null
+++ b/AcetoneISO.spec
@@ -0,0 +1,108 @@
+Name:		AcetoneISO
+Version:	6.7
+Release:	4%{?dist}
+Summary:	CD/DVD Image Manipulator
+Group:		Applications/Archiving
+License:	GPL
+URL:		http://www.acetoneteam.org/
+#Source0:	http://www.acetoneteam.org/Archivia/%{name}-%{version}.tar.gz
+# Upstream source includes poweriso binary, closed source, no redistribution permission.
+Source0:	%{name}-%{version}-clean.tar.gz
+BuildRoot:  	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: 	kdewebdev-devel, desktop-file-utils
+Requires:	p7zip, xbiso, k3b, kdebase, arts, cdrdao, nrg2iso
+# Overkill, but I'm being thorough
+Requires:	util-linux, coreutils, kdewebdev
+
+%description
+AcetoneISO: The CD/DVD image manipulator for Linux, it can do the following:
+- Mount and Unmount ISO, MDF, NRG (if iso-9660 standard)
+- Convert / Extract / Browse to ISO : *.bin *.mdf *.nrg *.img *.daa *.cdi 
+  *.xbx *.b5i *.bwi *.pdi
+- Play a DVD Movie ISO with most used media players
+- Generate an ISO from a Folder or CD/DVD
+- Generate MD5 file of an image
+- Encrypt an image
+- Split image into X megabyte chunks
+- Highly compress an image
+- Rip a PSX cd to *.bin to make it work with epsxe/psx emulators
+- Service-Menu support for Konqueror
+- Restore a lost CUE file of *.bin *.img
+
+%prep
+%setup -q
+
+%build
+cd src/
+chmod -x *.c
+mkdir ../binaries
+# xbiso is in its own package
+# so is nrg2iso.
+for i in b5i2iso.c cdi2iso.c mdf2iso.c pdi2iso.c; do
+  SHORTNAME=`echo $i | sed 's/.c//'`
+  gcc $RPM_OPT_FLAGS $i -o ../binaries/$SHORTNAME
+done
+
+%install
+rm -rf $RPM_BUILD_ROOT 
+mkdir $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -p binaries/* $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/%{name}/scripts/
+sed -i 's|/opt/acetoneiso/|/usr/|g' %{name}-%{version}/AcetoneISO.kmdr
+chmod -x %{name}-%{version}/AcetoneISO.kmdr
+install -p %{name}-%{version}/AcetoneISO.kmdr $RPM_BUILD_ROOT%{_datadir}/apps/%{name}/scripts
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -p %{name}-%{version}/*.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+sed -i 's|/opt/acetoneiso/.|%{_sbindir}|g' %{name}-%{version}/acetoneiso-*mount.desktop
+chmod -x %{name}-%{version}/acetoneiso-*mount.desktop
+install -p %{name}-%{version}/*.sh $RPM_BUILD_ROOT%{_sbindir}
+
+sed -i 's|/opt/acetoneiso/|%{_datadir}/apps/%{name}/scripts/|g' %{name}-%{version}/acetoneiso
+install -p %{name}-%{version}/acetoneiso $RPM_BUILD_ROOT%{_bindir}
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/
+install -p %{name}-%{version}/acetoneiso-*mount.desktop $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mv %{name}-%{version}/AcetoneISO %{name}-%{version}/AcetoneISO.desktop
+sed -i 's|/opt/acetoneiso/|%{_datadir}/apps/%{name}/scripts/|g' %{name}-%{version}/AcetoneISO.desktop
+sed -i "s|'/usr/share/apps/AcetoneISO/scripts/AcetoneISO.kmdr'|/usr/share/apps/AcetoneISO/scripts/AcetoneISO.kmdr|g" %{name}-%{version}/AcetoneISO.desktop
+desktop-file-install --vendor ""			\
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
+	--add-category System				\
+	%{name}-%{version}/AcetoneISO.desktop
+
+%clean
+rm -rf $RPM_BUILD_ROOT 
+
+%files
+%defattr(-,root,root)
+%doc GPL README changelog
+%{_bindir}/acetoneiso
+%{_bindir}/b5i2iso
+%{_bindir}/cdi2iso
+%{_bindir}/mdf2iso
+%{_bindir}/pdi2iso
+%{_sbindir}/playiso-unmount.sh
+%{_sbindir}/turbo.sh
+%{_datadir}/applications/*.desktop
+%{_datadir}/apps/%{name}/
+%{_datadir}/apps/konqueror/servicemenus/acetoneiso-*.desktop
+%{_datadir}/pixmaps/*.png
+
+%changelog
+* Mon Nov 26 2007 Tom "spot" Callaway <tcallawa@redhat.com> - 6.7-4
+- Requires: kdewebdev
+
+* Wed Nov 21 2007 Tom "spot" Callaway <tcallawa@redhat.com> - 6.7-3
+- nrg2iso has its own package (bz 394441)
+
+* Thu Nov  8 2007 Tom "spot" Callaway <tcallawa@redhat.com> - 6.7-2
+- fix unowned directories
+- drop vendor in desktop file
+- fix desktop file to actually work
+
+* Mon Jun  4 2007 Tom "spot" Callaway <tcallawa@redhat.com> - 6.7-1
+- initial build for Fedora
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 0f74d82..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: AcetoneISO
-# $Id$
-NAME := AcetoneISO
-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/sources b/sources
index e69de29..bb94b4e 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+f75b37764812539817459d02876701d2  AcetoneISO-6.7-clean.tar.gz