diff --git a/.cvsignore b/.cvsignore
index f877c40..ab16ecd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Sphinx-0.6.3.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..06de2d2
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-12
diff --git a/python-sphinx.spec b/python-sphinx.spec
index e0e2077..33f73ae 100644
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -4,7 +4,7 @@
 %define upstream_name Sphinx
 
 Name:           python-sphinx
-Version:        0.6.3
+Version:        0.6.4
 Release:        1%{?dist}
 Summary:        Python documentation generator
 
@@ -109,6 +109,10 @@ 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
 
diff --git a/sources b/sources
index 5354ced..ad5c2c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8ba063eeeaf818a7ea07fd28d9614a9  Sphinx-0.6.3.tar.gz
+a65e0bcff6f79a7c013220d00ea137ad  Sphinx-0.6.4.tar.gz