diff --git a/.cvsignore b/.cvsignore
index e69de29..d5034e3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+koji-1.0.tar.bz2
diff --git a/koji.spec b/koji.spec
new file mode 100644
index 0000000..09ffa2b
--- /dev/null
+++ b/koji.spec
@@ -0,0 +1,192 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+%define baserelease 1
+#build with --define 'testbuild 1' to have a timestamp appended to release
+%if x%{?testbuild} == x1
+%define release %{baserelease}.%(date +%%Y%%m%%d.%%H%%M.%%S)
+%else
+%define release %{baserelease}
+%endif
+Name: koji
+Version: 1.0
+Release: %{release}%{?dist}
+License: LGPL
+Summary: Build system tools
+Group: Applications/System
+URL: http://hosted.fedoraproject.org/projects/koji
+Source: %{name}-%{PACKAGE_VERSION}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+Requires: python-krbV >= 1.0.13
+Requires: rpm-python
+Requires: pyOpenSSL
+BuildRequires: python
+
+%description
+Koji is a system for building and tracking RPMS.  The base package
+contains shared libraries and the command-line interface.
+
+%package hub
+Summary: Koji XMLRPC interface
+Group: Applications/Internet
+Requires: httpd
+Requires: mod_python
+Requires: postgresql-python
+Requires: %{name} = %{version}-%{release}
+
+%description hub
+koji-hub is the XMLRPC interface to the koji database
+
+%package builder
+Summary: Koji RPM builder daemon
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+Requires: mock >= 0.5-3
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/service
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(pre): /usr/sbin/useradd
+Requires: cvs
+Requires: rpm-build
+Requires: redhat-rpm-config
+Requires: createrepo >= 0.4.4
+
+%description builder
+koji-builder is the daemon that runs on build machines and executes
+tasks that come through the Koji system.
+
+%package utils
+Summary: Koji Utilities
+Group: Applications/Internet
+Requires: postgresql-python
+Requires: %{name} = %{version}-%{release}
+Requires: rpm-build
+Requires: createrepo >= 0.4.4
+
+%description utils
+Utilities for the Koji system
+
+%package web
+Summary: Koji Web UI
+Group: Applications/Internet
+Requires: httpd
+Requires: mod_python
+Requires: mod_auth_kerb
+Requires: postgresql-python
+Requires: python-cheetah
+Requires: %{name} = %{version}-%{release}
+Requires: python-krbV >= 1.0.13
+
+%description web
+koji-web is a web UI to the Koji system.
+
+%prep
+%setup -q
+
+%build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%{_bindir}/*
+%{python_sitelib}/%{name}
+%config(noreplace) %{_sysconfdir}/koji.conf
+%doc docs Authors COPYING LGPL
+
+%files hub
+%defattr(-,root,root)
+%{_datadir}/koji-hub
+%config(noreplace) /etc/httpd/conf.d/kojihub.conf
+
+%files utils
+%defattr(-,root,root)
+%{_sbindir}/kojira
+%{_initrddir}/kojira
+%config(noreplace) %{_sysconfdir}/sysconfig/kojira
+%{_sysconfdir}/kojira
+%config(noreplace) %{_sysconfdir}/kojira/kojira.conf
+
+%files web
+%defattr(-,root,root)
+%{_datadir}/koji-web
+%{_sysconfdir}/kojiweb
+%config(noreplace) /etc/httpd/conf.d/kojiweb.conf
+
+%files builder
+%defattr(-,root,root)
+%{_sbindir}/kojid
+%{_initrddir}/kojid
+%config(noreplace) %{_sysconfdir}/sysconfig/kojid
+%{_sysconfdir}/kojid
+%config(noreplace) %{_sysconfdir}/kojid/kojid.conf
+%attr(-,kojibuilder,kojibuilder) /etc/mock/koji
+
+%pre builder
+/usr/sbin/useradd -r -s /bin/bash -G mock -d /builddir -M kojibuilder 2>/dev/null ||:
+
+%post builder
+/sbin/chkconfig --add kojid
+/sbin/service kojid condrestart &> /dev/null || :
+
+%preun builder
+if [ $1 = 0 ]; then
+  /sbin/service kojid stop &> /dev/null
+  /sbin/chkconfig --del kojid
+fi
+
+%post utils
+/sbin/chkconfig --add kojira
+/sbin/service kojira condrestart &> /dev/null || :
+%preun utils
+if [ $1 = 0 ]; then
+  /sbin/service kojira stop &> /dev/null || :
+  /sbin/chkconfig --del kojira
+fi
+
+%changelog
+* Mon Apr 02 2007 Jesse Keating <jkeating@redhat.com> 1.0-1
+- Release 1.0!
+
+* Wed Mar 28 2007 Mike Bonnet <mikeb@redhat.com> - 0.9.7-4
+- set SSL connection timeout to 12 hours
+
+* Wed Mar 28 2007 Mike Bonnet <mikeb@redhat.com> - 0.9.7-3
+- avoid SSL renegotiation
+- improve log file handling in kojid
+- bug fixes in command-line and web UI
+
+* Sun Mar 25 2007 Mike Bonnet <mikeb@redhat.com> - 0.9.7-2
+- enable http access to packages in kojid
+- add Requires: pyOpenSSL
+- building srpms from CVS now works with the Extras CVS structure
+- fixes to the chain-build command
+- bug fixes in the XML-RPC and web interfaces
+
+* Tue Mar 20 2007 Jesse Keating <jkeating@redhat.com> - 0.9.7-1
+- Package up the needed ssl files
+
+* Tue Mar 20 2007 Jesse Keating <jkeating@redhat.com> - 0.9.6-1
+- 0.9.6 release, mostly ssl auth stuff
+- use named directories for config stuff
+- remove -3 requires on creatrepo, don't need that specific anymore
+
+* Tue Feb 20 2007 Jesse Keating <jkeating@redhat.com> - 0.9.5-8
+- Add Authors COPYING LGPL to the docs of the main package
+
+* Tue Feb 20 2007 Jesse Keating <jkeating@redhat.com> - 0.9.5-7
+- Move web files from /var/www to /usr/share
+- Use -p in install calls
+- Add rpm-python to requires for koji
+
+* Mon Feb 19 2007 Jesse Keating <jkeating@redhat.com> - 0.9.5-6
+- Clean up spec for package review
+
+* Sun Feb 04 2007 Mike McLean <mikem@redhat.com> - 0.9.5-1
+- project renamed to koji
diff --git a/sources b/sources
index e69de29..faf817b 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+509770ad9155722acf3baa4cb467c2b8  koji-1.0.tar.bz2