diff --git a/.gitignore b/.gitignore
index a43d0a6..601d7fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 python-fedora-0.3.20.tar.gz
+/python-fedora-0.3.21.tar.gz
diff --git a/python-fedora.spec b/python-fedora.spec
index 0d7e124..31ea1fe 100644
--- a/python-fedora.spec
+++ b/python-fedora.spec
@@ -1,19 +1,19 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.20
-Release:        5%{?dist}
+Version:        0.3.21
+Release:        1%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            https://fedorahosted.org/python-fedora/
-Source0:        https://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}.tar.gz
+Source0:        https://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}%{?prerel}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools-devel
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
 BuildRequires:  python-paver >= 1.0
 BuildRequires:  python-sphinx
 %if 0%{?fedora} >= 9 || 0%{?rhel} > 5
@@ -24,12 +24,16 @@ BuildRequires:  python-cherrypy
 BuildRequires:  python-babel
 BuildRequires:  TurboGears2
 BuildRequires:  python-nose
+BuildRequires:  python-kitchen
+BuildRequires:  python-bunch
 Requires:       python-simplejson
 Requires:       python-bugzilla
+Requires:       python-bunch
 Requires:       python-feedparser
 Requires:       python-sqlalchemy
 Requires:       python-decorator
 Requires:       python-pycurl
+Requires:       python-kitchen
 # These are now optional dependencies.  Some bodhi methods will not work if
 # they aren't installed but they aren't needed for most functionality of the
 # module.
@@ -45,7 +49,7 @@ be used to build programs that communicate with Fedora Infrastructure's
 TurboGears Applications such as Bodhi, PackageDB, MirrorManager, and FAS2.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?prerel}
 
 %build
 paver build
@@ -63,10 +67,16 @@ rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README COPYING AUTHORS ChangeLog doc
+%doc NEWS README COPYING AUTHORS ChangeLog doc
 %{python_sitelib}/*
 
 %changelog
+* Mon Apr 11 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 0.3.21-1
+- Upstream 0.3.21 release
+
+* Mon Feb 28 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 0.3.21-0.a1
+- 0.3.21 alpha1 release.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.20-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 31debbd..5c364a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d33c4a91b92d2cb73362a3d69e3c0a64  python-fedora-0.3.20.tar.gz
+e56fc2d5f42c14377da3f3d57d911c05  python-fedora-0.3.21.tar.gz