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..ad72926
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xfce4-stopwatch-plugin-0.2.0.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2547663..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfce4-stopwatch-plugin
-# $Id$
-NAME := xfce4-stopwatch-plugin
-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..cfefa7f 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+2ce672f294ee42cdc49ddbe1a1d8ae96  xfce4-stopwatch-plugin-0.2.0.tar.bz2
diff --git a/xfce4-stopwatch-plugin.spec b/xfce4-stopwatch-plugin.spec
new file mode 100644
index 0000000..58cdefc
--- /dev/null
+++ b/xfce4-stopwatch-plugin.spec
@@ -0,0 +1,72 @@
+# Review: https://bugzilla.redhat.com/show_bug.cgi?id=514351
+
+Name:		xfce4-stopwatch-plugin
+Version:	0.2.0
+Release:	2%{?dist}
+Summary:	Stopwatch plugin for the Xfce panel
+
+Group:		User Interface/Desktops
+License:	BSD
+URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
+Source0:	http://archive.xfce.org/src/panel-plugins/%{name}/0.2/%{name}-%{version}.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	xfce4-panel-devel >= 4.0.0, libxfcegui4-devel >= 4.6.0
+BuildRequires:	gettext, intltool, libxml2-devel
+Requires:	xfce4-panel >= 4.6.0
+
+%description
+The xfce-stopwatch-plugin is a panel plugin to keep track of elapsed time. 
+There are no ways to configure the plugin at this time, just add it to the 
+panel. The time elapsed will be saved when your panel quits and restored next 
+time it’s running. If time was ticking, it will not start ticking again 
+automatically.
+
+
+%prep
+%setup -q
+
+
+%build
+%configure --disable-static
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files 
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS
+%{_libexecdir}/xfce4/panel-plugins/%{name}
+%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}*
+
+
+%changelog
+* Sat Aug 01 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.2.0-2
+- Fix Source0 URL
+- Fix two typos in spec file
+
+* Tue Jul 28 2009 Christoph Wickert <cwickert@fedoraproject.org> - 0.2.0-1
+- Initial Fedora package.