diff --git a/.cvsignore b/.cvsignore
index 1bf367a..ab16ecd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Sphinx-0.5.1.tar.gz
+Sphinx-0.6.4.tar.gz
diff --git a/Makefile b/Makefile
index b609317..be369c3 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := python-sphinx
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))
diff --git a/branch b/branch
new file mode 100644
index 0000000..25c7708
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-11
diff --git a/python-sphinx-setuptools.patch b/python-sphinx-setuptools.patch
new file mode 100644
index 0000000..c4cfb6a
--- /dev/null
+++ b/python-sphinx-setuptools.patch
@@ -0,0 +1,9 @@
+--- setup.py.orig	2009-06-05 07:42:36.000000000 -0400
++++ setup.py	2009-06-05 07:42:40.000000000 -0400
+@@ -1,6 +1,4 @@
+ # -*- coding: utf-8 -*-
+-import ez_setup
+-ez_setup.use_setuptools()
+ 
+ import os
+ import sys
diff --git a/python-sphinx.spec b/python-sphinx.spec
index a180df6..33f73ae 100644
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -4,19 +4,20 @@
 %define upstream_name Sphinx
 
 Name:           python-sphinx
-Version:        0.5.1
-Release:        2%{?dist}
+Version:        0.6.4
+Release:        1%{?dist}
 Summary:        Python documentation generator
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://sphinx.pocoo.org/
 Source0:        http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
+Patch0:         %{name}-setuptools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-docutils python-jinja python-setuptools
-Requires:       python-docutils python-jinja python-pygments
+BuildRequires:  python-devel python-docutils python-jinja2 python-setuptools
+Requires:       python-docutils python-jinja2 python-pygments
 
 
 %description
@@ -68,6 +69,7 @@ This package contains documentation in rST and HTML formats
 
 %prep
 %setup -q -n %{upstream_name}-%{version}
+%patch0 -p0 -b .setuptools
 
 
 %build
@@ -107,6 +109,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 13 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.4-1
+- Update to 0.6.4
+- Fixes a problem using autodoc with pylons projects.
+
+* Fri Sep  4 2009 Michel Salim <salimma@fedoraproject.org> - 0.6.3-1
+- Update to 0.6.3
+
+* Mon Aug 17 2009 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.2-1
+- Update to 0.6.2 -- upstream bugfix requested inside bz#512438
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun 05 2009 Luke Macken <lmacken@redhat.com> - 0.6.1-2
+- Add a patch to use our own setuptools package
+
+* Fri Apr 17 2009 Michel Salim <salimma@fedoraproject.org> - 0.6.1-1
+- Update to 0.6.1
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index f90f6b5..ad5c2c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-11456e362d75c1a4c5a5847921d3f4c7  Sphinx-0.5.1.tar.gz
+a65e0bcff6f79a7c013220d00ea137ad  Sphinx-0.6.4.tar.gz