diff --git a/.cvsignore b/.cvsignore
index 7915efe..dd8d4f8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-docutils-0.5.tar.gz
+docutils-0.6.tar.gz
diff --git a/python-docutils.spec b/python-docutils.spec
index a634106..89d19c5 100644
--- a/python-docutils.spec
+++ b/python-docutils.spec
@@ -1,11 +1,11 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define srcname docutils
 
 Name:           python-%{srcname}
-Version:        0.5
-Release:        4%{?dist}
-Summary:        A system for processing plaintext documentation
+Version:        0.6
+Release:        1%{?dist}
+Summary:        System for processing plaintext documentation
 
 Group:          Development/Languages
 # See COPYING.txt for information
@@ -40,13 +40,13 @@ Python inline documentation modules and packages.
 sed -i -e '/#! *\/usr\/bin\/.*python.*/{1D}' docutils/readers/python/pynodes.py
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 
 %install
 rm -rf %{buildroot}
 
-%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}
+%{__python} setup.py install --skip-build --root %{buildroot}
 
 for file in %{buildroot}/%{_bindir}/*.py; do
     mv $file `dirname $file`/`basename $file .py`
@@ -73,9 +73,16 @@ rm -rf %{buildroot}
 %{_bindir}/*
 %{python_sitelib}/docutils/
 %{python_sitelib}/roman.*
-%{python_sitelib}/*egg-info/
+%{python_sitelib}/*egg-info
 
 %changelog
+* Tue Jan 19 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6-1
+- Update for 0.6 release.
+- Switch from setuptools installed egg-info to distutils egg-info.  Note that
+  this works because we're also changing docutils version.  To do this between
+  0.5-4 and 0.5-5, for instance, we'd need to have %%preun scriptlet to get rid
+  of the egg-info directory.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 44374ad..b717765 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd72dac92fc8e3eb0f48c3effeef80f6  docutils-0.5.tar.gz
+5c615479a965bc773892f585e0e08119  docutils-0.6.tar.gz