diff --git a/.cvsignore b/.cvsignore
index e69de29..b95b386 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+buildbot-0.7.4.tar.gz
diff --git a/buildbot-no-shebang.patch b/buildbot-no-shebang.patch
new file mode 100644
index 0000000..ed13690
--- /dev/null
+++ b/buildbot-no-shebang.patch
@@ -0,0 +1,182 @@
+--- buildbot-0.7.3/buildbot/clients/base.py	2005-08-10 18:07:51.000000000 +1200
++++ buildbot-0.7.3/buildbot/clients/base.py.mjk	2006-07-07 10:18:20.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ import sys, re
+ 
+--- buildbot-0.7.3/buildbot/clients/gtkPanes.py	2005-11-06 10:04:57.000000000 +1300
++++ buildbot-0.7.3/buildbot/clients/gtkPanes.py.mjk	2006-07-07 10:18:30.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ from twisted.internet import gtk2reactor
+ gtk2reactor.install()
+--- buildbot-0.7.3/buildbot/clients/debug.py	2005-11-06 10:04:57.000000000 +1300
++++ buildbot-0.7.3/buildbot/clients/debug.py.mjk	2006-07-07 10:24:08.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ from twisted.internet import gtk2reactor
+ gtk2reactor.install()
+--- buildbot-0.7.3/buildbot/slave/bot.py	2006-02-17 21:24:12.000000000 +1300
++++ buildbot-0.7.3/buildbot/slave/bot.py.mjk	2006-07-07 10:27:47.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ import time, os, os.path, re, sys
+ 
+--- buildbot-0.7.3/buildbot/slave/interfaces.py	2004-12-04 11:54:52.000000000 +1300
++++ buildbot-0.7.3/buildbot/slave/interfaces.py.mjk	2006-07-07 10:27:28.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ from twisted.python.components import Interface
+ 
+--- buildbot-0.7.3/buildbot/slave/registry.py	2005-04-14 17:52:07.000000000 +1200
++++ buildbot-0.7.3/buildbot/slave/registry.py.mjk	2006-07-07 10:21:01.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ commandRegistry = {}
+ 
+--- buildbot-0.7.3/buildbot/changes/maildir.py	2006-07-07 10:34:07.000000000 +1200
++++ buildbot-0.7.3/buildbot/changes/maildir.py.mjk	2006-07-07 10:34:17.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ # This is a class which watches a maildir for new messages. It uses the
+ # linux dirwatcher API (if available) to look for new files. The
+--- buildbot-0.7.3/buildbot/changes/maildirtwisted.py	2005-08-16 08:24:36.000000000 +1200
++++ buildbot-0.7.3/buildbot/changes/maildirtwisted.py.mjk	2006-07-07 10:31:37.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ # This is a class which watches a maildir for new messages. It uses the
+ # linux dirwatcher API (if available) to look for new files. The
+--- buildbot-0.7.3/buildbot/changes/maildirgtk.py	2003-02-13 11:07:04.000000000 +1300
++++ buildbot-0.7.3/buildbot/changes/maildirgtk.py.mjk	2006-07-07 10:32:42.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ # This is a class which watches a maildir for new messages. It uses the
+ # linux dirwatcher API (if available) to look for new files. The
+--- buildbot-0.7.3/buildbot/changes/freshcvs.py	2005-11-27 14:37:31.000000000 +1300
++++ buildbot-0.7.3/buildbot/changes/freshcvs.py.mjk	2006-07-07 10:33:01.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ import os.path
+ 
+--- buildbot-0.7.3/buildbot/changes/freshcvsmail.py	2003-07-28 19:22:00.000000000 +1200
++++ buildbot-0.7.3/buildbot/changes/freshcvsmail.py.mjk	2006-07-07 10:32:20.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ # leftover import for compatibility
+ 
+--- buildbot-0.7.3/buildbot/changes/dnotify.py	2005-05-17 06:46:28.000000000 +1200
++++ buildbot-0.7.3/buildbot/changes/dnotify.py.mjk	2006-07-07 10:33:20.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ import fcntl, signal, os
+ 
+--- buildbot-0.7.3/buildbot/changes/changes.py	2005-11-27 14:37:31.000000000 +1300
++++ buildbot-0.7.3/buildbot/changes/changes.py.mjk	2006-07-07 10:22:16.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ from __future__ import generators
+ import string, sys, os, os.path, time, types
+--- buildbot-0.7.3/buildbot/changes/base.py	2005-05-17 22:14:09.000000000 +1200
++++ buildbot-0.7.3/buildbot/changes/base.py.mjk	2006-07-07 10:31:20.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ from twisted.application import service
+ from twisted.python import components
+--- buildbot-0.7.3/buildbot/process/step_twisted2.py	2006-04-24 06:42:48.000000000 +1200
++++ buildbot-0.7.3/buildbot/process/step_twisted2.py.mjk	2006-07-07 11:01:12.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ from buildbot.status import tests
+ from buildbot.process.step import SUCCESS, FAILURE, WARNINGS, SKIPPED, \
+--- buildbot-0.7.3/buildbot/process/process_twisted.py	2006-05-24 04:12:21.000000000 +1200
++++ buildbot-0.7.3/buildbot/process/process_twisted.py.mjk	2006-07-07 10:44:09.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ # Build classes specific to the Twisted codebase
+ 
+--- buildbot-0.7.3/buildbot/process/builder.py	2006-04-24 06:42:48.000000000 +1200
++++ buildbot-0.7.3/buildbot/process/builder.py.mjk	2006-07-07 10:21:32.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ import warnings
+ 
+--- buildbot-0.7.3/buildbot/status/words.py	2006-03-13 21:42:32.000000000 +1300
++++ buildbot-0.7.3/buildbot/status/words.py.mjk	2006-07-07 11:04:07.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ # code to deliver build status through twisted.words (instant messaging
+ # protocols: irc, etc)
+--- buildbot-0.7.3/buildbot/status/tests.py	2003-04-26 11:59:50.000000000 +1200
++++ buildbot-0.7.3/buildbot/status/tests.py.mjk	2006-07-07 11:03:54.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ from twisted.web import resource
+ from twisted.web.error import NoResource
+--- buildbot-0.7.3/buildbot/status/base.py	2005-10-23 10:23:41.000000000 +1300
++++ buildbot-0.7.3/buildbot/status/base.py.mjk	2006-07-07 11:03:37.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ from twisted.application import service
+ from twisted.python import components
+--- buildbot-0.7.3/buildbot/test/sleep.py	2005-07-19 13:55:20.000000000 +1200
++++ buildbot-0.7.3/buildbot/test/sleep.py.mjk	2006-07-07 11:06:23.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ import sys, time
+ delay = int(sys.argv[1])
+--- buildbot-0.7.3/buildbot/test/emit.py	2004-01-09 09:05:24.000000000 +1300
++++ buildbot-0.7.3/buildbot/test/emit.py.mjk	2006-07-07 11:06:02.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ import os, sys
+ 
+--- buildbot-0.7.3/buildbot/interfaces.py	2006-05-24 04:12:20.000000000 +1200
++++ buildbot-0.7.3/buildbot/interfaces.py.mjk	2006-07-07 11:07:48.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ """Interface documentation.
+ 
+--- buildbot-0.7.3/buildbot/__init__.py	2006-05-24 04:51:11.000000000 +1200
++++ buildbot-0.7.3/buildbot/__init__.py.mjk	2006-07-07 11:08:24.000000000 +1200
+@@ -1,3 +1,2 @@
+-#! /usr/bin/python
+ 
+ version = "0.7.3"
+--- buildbot-0.7.3/buildbot/dnotify.py	2003-02-13 10:56:57.000000000 +1300
++++ buildbot-0.7.3/buildbot/dnotify.py.mjk	2006-07-07 11:08:06.000000000 +1200
+@@ -1,4 +1,3 @@
+-#! /usr/bin/python
+ 
+ # spiv wants this
+ 
+--- buildbot-0.7.4/buildbot/test/emitlogs.py	2006-08-23 19:11:16.000000000 +1200
++++ buildbot-0.7.4/buildbot/test/emitlogs.py.mjk	2006-09-08 16:59:07.000000000 +1200
+@@ -1,5 +1,3 @@
+-#! /usr/bin/python
+-
+ import sys, time, os.path, StringIO
+ 
+ mode = 0
diff --git a/buildbot.spec b/buildbot.spec
new file mode 100644
index 0000000..6f7f204
--- /dev/null
+++ b/buildbot.spec
@@ -0,0 +1,74 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+Name:           buildbot
+Version:        0.7.4
+Release:        2%{?dist}
+Summary:        BuildBot build automation system
+
+Group:          Development/Tools
+License:        GPL
+URL:            http://buildbot.sourceforge.net
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:		%{name}-no-shebang.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  python-devel
+Requires:       python-twisted >= 1.3.0, python-cvstoys
+
+BuildArch:	noarch
+
+%description
+The BuildBot is a system to automate the compile/test cycle required by
+most software projects to validate code changes. By automatically
+rebuilding and testing the tree each time something has changed, build
+problems are pinpointed quickly, before other developers are
+inconvenienced by the failure.
+
+%prep
+%setup -q
+%patch0 -p1
+
+%build
+%{__python} setup.py build
+
+%install
+rm -rf %{buildroot}
+
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+
+mkdir -p %{buildroot}/%{_datadir}/%{name}/
+cp -R contrib %{buildroot}/%{_datadir}/%{name}/
+
+# clean up Windows contribs.
+sed -i 's/\r//' %{buildroot}/%{_datadir}/%{name}/contrib/windows/*
+chmod -x %{buildroot}/%{_datadir}/%{name}/contrib/windows/*
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog NEWS README docs
+%{_bindir}/buildbot
+%{python_sitelib}/buildbot
+%{_datadir}/%{name}
+
+
+%changelog
+* Sat Sep 09 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.7.4-2
+- cleanup %%files
+
+* Fri Sep 08 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.7.4-1
+- Upstream update
+- don't ghost pyo files
+
+* Fri Jul 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.7.3-3
+- move contribs to %%{_datadir}/%{name}
+
+* Fri Jul 07 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.7.3-2
+- fixes for review
+- added patch to remove #! where its not needed (shutup rpmlint)
+
+* Sun Jun 02 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.7.3-1
+- Inital build for FE
diff --git a/sources b/sources
index e69de29..8dd296a 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+a311b9c9b283acc8e6fa8770d099bae7  buildbot-0.7.4.tar.gz