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 e1f947c..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: aasaver
-# $Id$
-NAME := aasaver
-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/aasaver.spec b/aasaver.spec
new file mode 100644
index 0000000..22153d3
--- /dev/null
+++ b/aasaver.spec
@@ -0,0 +1,55 @@
+Name:           aasaver
+Version:        0.3.2
+Release:        2%{?dist}
+Summary:        A screensaver for KDE which presents an ASCII aquarium
+Group:          Amusements/Graphics
+License:        GPLv2+
+URL:            http://www.kde-apps.org/content/show.php/KDE+Asciiquarium?content=29207
+# Actual source URL is:
+# http://www.kde-apps.org/content/download.php?content=29207
+Source0:        29207-%{name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  kdelibs3-devel
+BuildRequires:  scons
+Requires:       xscreensaver-base
+
+%description
+KDE Asciiquarium is a KDE screensaver based on Kirk Baucom's fabulous
+asciiquarium program (http://www.robobunny.com/projects/asciiquarium/). It's a
+simulation of an animated ocean scene using ASCII art.
+
+
+%prep
+%setup -q
+sed -i 's|rpath||' SConstruct
+
+
+%build
+export CFLAGS="%{optflags}"
+# Not a true configure script
+./configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}/usr
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/asciiquarium.kss
+%{_datadir}/applnk/System/ScreenSavers/asciiquarium.desktop
+%config(noreplace) %{_datadir}/config.kcfg/asciiquarium.kcfg
+
+
+%changelog
+* Sun Jan 06 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.3.2-2
+- Use kdelibs3-devel now instead of kdelibs-devel
+
+* Sun Sep 30 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.3.2-1
+- Initial release
diff --git a/sources b/sources
index e69de29..63a6ae7 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+dfc6780c196883f25ec01b4663dfaca3  29207-aasaver-0.3.2.tar.bz2