diff --git a/.cvsignore b/.cvsignore
index e69de29..8004051 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+bugzilla-2.22.tar.gz
diff --git a/README.fedora.bugzilla b/README.fedora.bugzilla
new file mode 100644
index 0000000..ea9b201
--- /dev/null
+++ b/README.fedora.bugzilla
@@ -0,0 +1,16 @@
+Bugzilla is a powerful bug tracking system used by a large number of open
+source projects.
+
+In order to use Bugzilla, you will first need to configure it for your
+environment. The first step to doing this is to run the checksetup.pl
+script, which will perform module version checks and create an initial
+config file in /etc/bugzilla called localconfig. You then need to ensure
+the values in this file are accurate for your environment.
+
+Once this is done, you may need to modify default settings for your database
+to ensure it accepts Bugzilla data properly. Please see
+http://www.bugzilla.org/docs/2.22/html/configuration.html for specifics of
+database setting modifications.
+
+Lastly, simply re-run checksetup.pl to populate the database tables, set up
+the templates, and add the administrator ID. You should be done at this point.
diff --git a/bugzilla-config-path.patch b/bugzilla-config-path.patch
new file mode 100644
index 0000000..1ee006e
--- /dev/null
+++ b/bugzilla-config-path.patch
@@ -0,0 +1,16 @@
+diff -ruN bugzilla-neworig/Bugzilla/Config.pm bugzilla-2.22/Bugzilla/Config.pm
+--- bugzilla-neworig/Bugzilla/Config.pm 2006-06-19 16:29:00.000000000 -0400
++++ bugzilla-2.22/Bugzilla/Config.pm 2006-06-25 10:20:02.000000000 -0400
+@@ -61,10 +61,10 @@
+ our $datadir;
+ if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) {
+ $project = $1;
+- $localconfig = "$libpath/localconfig.$project";
++ $localconfig = "/etc/bugzilla/localconfig.$project";
+ $datadir = "/var/lib/bugzilla/data/$project";
+ } else {
+- $localconfig = "$libpath/localconfig";
++ $localconfig = "/etc/bugzilla/localconfig";
+ $datadir = "/var/lib/bugzilla/data";
+ }
+ our $attachdir = "$datadir/attachments";
diff --git a/bugzilla-data-dir.patch b/bugzilla-data-dir.patch
new file mode 100644
index 0000000..b8e2943
--- /dev/null
+++ b/bugzilla-data-dir.patch
@@ -0,0 +1,16 @@
+diff -ruN bugzilla-orig/Bugzilla/Config.pm bugzilla-2.22/Bugzilla/Config.pm
+--- bugzilla-orig/Bugzilla/Config.pm 2006-04-22 22:45:09.000000000 -0400
++++ bugzilla-2.22/Bugzilla/Config.pm 2006-06-19 16:29:00.000000000 -0400
+@@ -62,10 +62,10 @@
+ if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) {
+ $project = $1;
+ $localconfig = "$libpath/localconfig.$project";
+- $datadir = "$libpath/data/$project";
++ $datadir = "/var/lib/bugzilla/data/$project";
+ } else {
+ $localconfig = "$libpath/localconfig";
+- $datadir = "$libpath/data";
++ $datadir = "/var/lib/bugzilla/data";
+ }
+ our $attachdir = "$datadir/attachments";
+ our $webdotdir = "$datadir/webdot";
diff --git a/bugzilla-httpd-conf b/bugzilla-httpd-conf
new file mode 100644
index 0000000..c251546
--- /dev/null
+++ b/bugzilla-httpd-conf
@@ -0,0 +1,8 @@
+Alias /bugzilla /usr/share/bugzilla
+
+
+ AddHandler cgi-script .cgi
+ Options +Indexes +ExecCGI +FollowSymLinks
+ DirectoryIndex index.cgi
+ AllowOverride Limit
+
diff --git a/bugzilla.spec b/bugzilla.spec
new file mode 100644
index 0000000..3d41007
--- /dev/null
+++ b/bugzilla.spec
@@ -0,0 +1,164 @@
+%define bzinstallprefix %{_datadir}
+%define bzdatadir %{_localstatedir}/lib/bugzilla
+
+Summary: Bug tracking system
+URL: http://www.bugzilla.org/
+Name: bugzilla
+Version: 2.22
+Group: Applications/Publishing
+Release: 5%{?dist}
+License: MPL
+Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
+Source1: bugzilla-httpd-conf
+Source2: README.fedora.bugzilla
+Patch0: bugzilla-data-dir.patch
+Patch1: bugzilla-config-path.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+Requires: smtpdaemon, webserver, graphviz, patchutils
+
+%package doc
+Summary: Bugzilla documentation
+Group: Documentation
+
+%package contrib
+Summary: Bugzilla contributed scripts
+Group: Applications/Publishing
+
+%description
+Bugzilla is a popular bug tracking system used by multiple open source
+projects. It requires a database engine installed - either MySQL or
+PostgreSQL. Without one of these database engines, Bugzilla will not work.
+
+%description doc
+Documentation distributed with the Bugzilla bug tracking system
+
+%description contrib
+Contributed scripts and functions for Bugzilla
+
+%prep
+%setup -q -n %{name}-%{version}
+%patch0 -p1
+%patch1 -p1
+
+# Filter unwanted Requires:
+cat << \EOF > %{name}-req
+#!/bin/sh
+%{__perl_requires} $* |\
+ sed -e '/perl(globals.pl)/d'
+EOF
+
+%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
+chmod +x %{__perl_requires}
+
+# Deal with changing /usr/local paths here instead of via patches
+%{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python}|' contrib/*.py
+%{__perl} -pi -e 's|/usr/local/bin/ruby\b|%{_bindir}/ruby|' contrib/*.rb
+grep -rl '/usr/lib/sendmail\b' contrib docs \
+| xargs %{__perl} -pi -e 's|/usr/lib/sendmail\b|%{_sbindir}/sendmail|'
+
+%build
+find . -depth -name CVS -type d -exec rm -rf {} \;
+find . -depth -name .cvsignore -type f -exec rm -rf {} \;
+# Remove the execute bit from files that don't start with #!
+for file in `find -type f -perm /111`; do
+ if head -1 $file | egrep -v '^\#!' &>/dev/null; then
+ chmod a-x $file
+ fi
+done
+# Ensure shebang shell scripts have executable bit set
+for file in `find -type f -perm /664`; do
+ if head -1 $file | egrep '^\#!' &>/dev/null; then
+ chmod a+x $file
+ fi
+done
+
+
+%install
+mkdir -p ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla
+cp -pr * ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla
+rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/{README,QUICKSTART,UPGRADING,UPGRADING-pre-2.8}
+mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version}
+cp %{SOURCE2} ./README.fedora
+mkdir -p ${RPM_BUILD_ROOT}/%{bzdatadir}
+mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/bugzilla
+install -m 0644 -D -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/bugzilla.conf
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+%post
+pushd %{bzinstallprefix}/bugzilla > /dev/null
+./checksetup.pl > /dev/null
+popd > /dev/null
+
+%files
+%defattr(-,root,root,-)
+%dir %{bzinstallprefix}/bugzilla
+%{bzinstallprefix}/bugzilla/*.cgi
+%{bzinstallprefix}/bugzilla/*.js
+%{bzinstallprefix}/bugzilla/*.pl
+%{bzinstallprefix}/bugzilla/Bugzilla.pm
+%{bzinstallprefix}/bugzilla/bugzilla.dtd
+%{bzinstallprefix}/bugzilla/duplicates.xul
+%{bzinstallprefix}/bugzilla/robots.txt
+%{bzinstallprefix}/bugzilla/Bugzilla
+%{bzinstallprefix}/bugzilla/images
+%{bzinstallprefix}/bugzilla/js
+%{bzinstallprefix}/bugzilla/skins
+%{bzinstallprefix}/bugzilla/t
+%{bzinstallprefix}/bugzilla/template
+%ghost %{bzinstallprefix}/bugzilla/bugzilla-req
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf
+%doc README
+%doc QUICKSTART
+%doc UPGRADING
+%doc UPGRADING-pre-2.8
+%doc README.fedora
+%dir %{bzdatadir}
+%dir %{_sysconfdir}/bugzilla
+
+%files doc
+%{bzinstallprefix}/bugzilla/docs
+
+%files contrib
+%{bzinstallprefix}/bugzilla/contrib
+
+%changelog
+* Mon Jun 26 2006 John Berninger - 2.22-5
+- License is MPL, not GPL
+- Clean up %doc specs
+
+* Sun Jun 25 2006 John Benringer - 2.22-4
+- Remove localconfig file per upstream
+- Patch to have localconfig appear in /etc/bugzilla when checksetup.pl is run
+
+* Tue Jun 20 2006 John Berninger - 2.22-3
+- Add README.fedora file
+- Add additional requires per comments from upstream
+
+* Mon Jun 19 2006 John Berninger - 2.22-2
+- Code to /usr/share, data to /var/lib/bugzilla per FE packaging req's
+
+* Tue Jun 13 2006 John Berninger - 2.22-1
+- Shift to /var/lib/bugzilla install dir per discussion in review request
+- Minor change in filtering requires
+
+* Tue May 23 2006 John Berninger - 2.22-0
+- Update to upstream 2.22 release
+- Split off -contrib package, but keep it where it usually gets installed
+
+* Wed Apr 26 2006 John Berninger - 2.20.1-4
+- rpmlint cleanups
+
+* Mon Apr 24 2006 John Berninger - 2.20.1-3
+- Cleanup of prov/req filters
+- Split docs into -doc package
+
+* Thu Apr 20 2006 John Berninger - 2.20.1-2
+- No need for CVS tarball - I was thinking things too far through. Change
+ to 2.20.1 release.
+
+* Fri Apr 7 2006 John Berninger - 2.20-0.1cvs20060407
+- Initial spec creation/build for Fedora Extras packaging.
+
diff --git a/sources b/sources
index e69de29..76a4049 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+bbf2f1ec5607978d39855df104231973 bugzilla-2.22.tar.gz