diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f1883f3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+wavemon-0.6.6.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c3affba..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wavemon
-# $Id$
-NAME := wavemon
-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..650640f 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+b3a4c65e1c85fe2999059526125e5e44  wavemon-0.6.10.tar.bz2
diff --git a/wavemon.spec b/wavemon.spec
new file mode 100644
index 0000000..fdf32d5
--- /dev/null
+++ b/wavemon.spec
@@ -0,0 +1,78 @@
+Name:           wavemon
+Version:        0.6.10
+Release:        1%{?dist}
+Summary:        Ncurses-based monitoring application for wireless network devices
+
+Group:          Applications/Internet
+License:        GPLv2+
+URL:            http://eden-feed.erg.abdn.ac.uk/wavemon/
+Source0:        http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/%{name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  ncurses-devel
+Requires:       wireless-tools
+
+
+%description
+wavemon is a wireless device monitoring application that allows you to
+watch all important information like device configuration, encryption,
+and power management parameters and network information at once.
+Adaptive level bargraphs for link quality, signal/noise strength and
+signal-to-noise ratio.  The customizeable "level alarm" feature that 
+notices the user of changes in signal level strength audibly and/or
+visually. wavemon is able to list of access points in range and shows
+full-screen level histogram displaying signal/noise levels and SNR.
+
+
+%prep
+%setup -q
+
+
+%build
+%configure
+make CFLAGS="%{optflags}" %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+#Delete wrong placed doc files
+rm -rf %{buildroot}%{_datadir}/%{name}/*
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README NEWS THANKS
+%{_mandir}/man*/%{name}*.*
+%{_bindir}/%{name}
+
+
+%changelog
+* Thu Nov 19 2009 Fabian Affolter <fabian@bernewireless.net> - 0.6.10-1
+- Updated to new upstream 0.6.10
+
+* Thu Aug 06 2009 Fabian Affolter <fabian@bernewireless.net> - 0.6.7-1
+- Updated to new upstream 0.6.7
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jun 27 2009 Fabian Affolter <fabian@bernewireless.net> - 0.6.6-1
+- Updated to new upstream 0.6.6
+
+* Thu May 18 2009 Fabian Affolter <fabian@bernewireless.net> - 0.6.5-1
+- Updated to new upstream 0.6.5
+
+* Mon May 04 2009 Fabian Affolter <fabian@bernewireless.net> - 0.6-2
+- Added optflags to make
+
+* Sat May 02 2009 Fabian Affolter <fabian@bernewireless.net> - 0.6-1
+- Updated install and prep section
+- Updated to new upstream version 0.6
+
+* Wed Feb 25 2009 Fabian Affolter <fabian@bernewireless.net> - 0.5-1
+- Initial package for Fedora