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..04ca0b5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+zapplet-0.1.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index bd6cfac..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: zapplet
-# $Id$
-NAME := zapplet
-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/README.fedora b/README.fedora
new file mode 100644
index 0000000..fbba5cb
--- /dev/null
+++ b/README.fedora
@@ -0,0 +1,2 @@
+To have Zapplet start on login use the following command as root: 
+'cp /usr/share/applications/zapplet.desktop  /etc/xdg/autostart/zapplet.desktop'
diff --git a/sources b/sources
index e69de29..6e419ba 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+d12db237f805d6711d8d720080e06eaa  zapplet-0.1.tar.gz
diff --git a/zapplet.spec b/zapplet.spec
new file mode 100644
index 0000000..59cf0d5
--- /dev/null
+++ b/zapplet.spec
@@ -0,0 +1,52 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+Name:           zapplet
+Version:        0.1
+Release:        4%{dist} 
+Summary:        Zenoss Tray Applet
+Group:          Applications/Communications
+License:        GPLv2+
+URL:            http://zapplet.sourceforge.net
+Source0:        http://downloads.sourceforge.net/zapplet/zapplet-%{version}.tar.gz
+Source1:        http://ke4qqq.fedorapeople.org/zapplet/README.fedora
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  python
+BuildRequires:  python-setuptools-devel 
+BuildRequires:  desktop-file-utils
+Requires:       pygtk2 
+BuildArch:      noarch
+
+%description
+Zapplet is a tray applet for monitoring aspects of Zenoss from the desktop. 
+
+%prep
+%setup -q -n zapplet-%{version}
+cp %{SOURCE1} ./README.fedora
+%build
+CFLAGS="%{optflags}" %{__python} setup.py build
+
+%install
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+
+desktop-file-install --add-category="Network" --dir=%{buildroot}%{_datadir}/applications zapplet.desktop
+rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/zapplet.desktop
+
+%clean 
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%{python_sitelib}/*
+%{_bindir}/%{name} 
+%{_datadir}/applications/zapplet.desktop
+%doc README.fedora
+%changelog
+* Mon Jan 19 2009 David Nalley <david@gnsa.us> 0.1-4
+- Made changes suggested by ianweller to fix cvs issues
+* Sun Dec 28 2008 David Nalley <david@gnsa.us> 0.1-3
+- Made changes suggested by Brian Pepple
+* Sat Dec 27 2008 David Nalley <david@gnsa.us> 0.1-2
+- Making corrections suggested by Fabian Affolter
+* Sun Dec 14 2008 David Nalley <david@gnsa.us> 0.1-1
+- Initial packaging efforts
+