diff --git a/.cvsignore b/.cvsignore
index f80b0b7..6b24970 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-python-fedora-0.3.5.tar.gz
+python-fedora-0.3.6.tar.gz
diff --git a/python-fedora.spec b/python-fedora.spec
index 2815d62..c36acd8 100644
--- a/python-fedora.spec
+++ b/python-fedora.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-fedora
-Version:        0.3.5
-Release:        1%{?dist}
+Version:        0.3.6
+Release:        2%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
@@ -12,12 +12,18 @@ Source0:        https://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-setuptools-devel python-paver
+BuildRequires:  python-devel
+BuildRequires:  python-setuptools-devel
+BuildRequires:  python-paver
+BuildRequires:  python-sphinx
 Requires:       python-simplejson
 Requires:       python-bugzilla
 Requires:       python-feedparser
 Requires:       python-sqlalchemy
-Requires:       koji
+# 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.
+#Requires:       koji python-iniparse yum
 Provides:       python-fedora-infrastructure = %{version}-%{release}
 Obsoletes:      python-fedora-infrastructure < %{version}-%{release}
 
@@ -33,13 +39,13 @@ TurboGears Applications such as Bodhi, PackageDB, MirrorManager, and FAS2.
 
 %build
 paver build
-
+paver html
 
 %install
 rm -rf $RPM_BUILD_ROOT
 paver install --skip-build --root $RPM_BUILD_ROOT
+mv build-doc/html doc/
 
- 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -50,6 +56,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Mon Sep 15 2008 Toshio Kuratomi <toshio@fedoraproject.org> - 0.3.6-2
+- Add python-sphinx to the buildrequires.
+
+* Mon Sep 15 2008 Toshio Kuratomi <toshio@fedoraproject.org> - 0.3.6-1
+- New upstream.  No longer deps on koji.
+
 * Mon Aug 25 2008 Luke Macken <lmacken@redhat.com> - 0.3.5-1
 - New upstream release
 
diff --git a/sources b/sources
index 66489ea..ecd56ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d6cf8d8cb5aaeb60573b8edcd9183b9  python-fedora-0.3.5.tar.gz
+d5ab6c21460f91df20df5fd6e0d36221  python-fedora-0.3.6.tar.gz