diff --git a/.gitignore b/.gitignore
index 566ba0f..e76dacf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /python-fedora-0.3.32.1.tar.gz
 /python-fedora-0.3.32.2.tar.gz
 /python-fedora-0.3.32.3.tar.gz
+/python-fedora-0.3.33.tar.gz
diff --git a/python-fedora.spec b/python-fedora.spec
index fe4d18f..4e37ff0 100644
--- a/python-fedora.spec
+++ b/python-fedora.spec
@@ -1,26 +1,28 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{!? __python2: %global __python2 /usr/bin/python2}
+%{!? python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%endif
 #%%global prerel c2
 
 Name:           python-fedora
-Version:        0.3.32.3
-Release:        3%{?dist}
+Version:        0.3.33
+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}%{?prerel}.tar.gz
-# Checked out from https://raw.github.com/fedora-infra/python-fedora/develop/flask_fas_openid.py
-# on 2013-07-23
-Source1: flask_fas_openid.py
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
-BuildRequires:  python-paver >= 1.0
+%if 0%{?rhel} && 0%{?rhel} <= 6
+BuildRequires:  python-sphinx10
+%else
 BuildRequires:  python-sphinx
+%endif
 %if 0%{?fedora} || 0%{?rhel} > 5
 BuildRequires:  python-cherrypy2
 %else
@@ -124,25 +126,24 @@ Account System.
 %setup -q -n %{name}-%{version}%{?prerel}
 
 %build
-paver build
-path=$(echo %{python_sitelib}/CherryPy-2.?.?-py2.?.egg)
-PYTHONPATH=$path paver html
+python2 setup.py build
+python2 setup.py build_sphinx
+python2 releaseutils.py build_catalogs
 
 %install
 rm -rf %{buildroot}
-paver install --skip-build --root %{buildroot}
-
-install -m 0644 %{SOURCE1} %{buildroot}%{python_sitelib}/flask_fas_openid.py
+python2 setup.py install --skip-build --root %{buildroot}
+DESTDIR=%{buildroot} python2 releaseutils.py install_catalogs
 
 # Cleanup doc
-mv build-doc/html doc/
+mv build/sphinx/html doc/
 if test -e doc/html/.buildinfo ; then
   rm doc/html/.buildinfo
 fi
 find doc -name 'EMPTY' -exec rm \{\} \;
 
 # Remove regression tests
-rm -rf %{buildroot}%{python_sitelib}/fedora/wsgi/test
+rm -rf %{buildroot}%{python2_sitelib}/fedora/wsgi/test
 
 %find_lang %{name}
 
@@ -152,29 +153,32 @@ rm -rf %{buildroot}
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc NEWS README COPYING AUTHORS doc
-%{python_sitelib}/*
-%exclude %{python_sitelib}/fedora/tg/
-%exclude %{python_sitelib}/fedora/tg2/
-%exclude %{python_sitelib}/fedora/wsgi/
-%exclude %{python_sitelib}/fedora/django/
-%exclude %{python_sitelib}/flask_fas.py*
-%exclude %{python_sitelib}/flask_fas_openid.py*
+%{python2_sitelib}/*
+%exclude %{python2_sitelib}/fedora/tg/
+%exclude %{python2_sitelib}/fedora/tg2/
+%exclude %{python2_sitelib}/fedora/wsgi/
+%exclude %{python2_sitelib}/fedora/django/
+%exclude %{python2_sitelib}/flask_fas.py*
+%exclude %{python2_sitelib}/flask_fas_openid.py*
 
 %files turbogears
-%{python_sitelib}/fedora/tg/
+%{python2_sitelib}/fedora/tg/
 
 %files turbogears2
-%{python_sitelib}/fedora/wsgi/
-%{python_sitelib}/fedora/tg2/
+%{python2_sitelib}/fedora/wsgi/
+%{python2_sitelib}/fedora/tg2/
 
 %files django
-%{python_sitelib}/fedora/django/
+%{python2_sitelib}/fedora/django/
 
 %files flask
-%{python_sitelib}/flask_fas.py*
-%{python_sitelib}/flask_fas_openid.py*
+%{python2_sitelib}/flask_fas.py*
+%{python2_sitelib}/flask_fas_openid.py*
 
 %changelog
+* Thu Dec 19 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 0.3.33-1
+- Update for final release with numerous flask_fas_openid fixes
+
 * Mon Jul 29 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 0.3.32.3-3
 - Update flask_fas_openid to fix imports
 
diff --git a/sources b/sources
index 7b5da48..6effa52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1d23925e00efdb2eaa8827b28211b71  python-fedora-0.3.32.3.tar.gz
+9e36812da4a0613cab0d379582509b6e  python-fedora-0.3.33.tar.gz