diff --git a/python-docutils.spec b/python-docutils.spec
index 859757e..170131b 100644
--- a/python-docutils.spec
+++ b/python-docutils.spec
@@ -4,19 +4,25 @@
 
 Name:           python-%{srcname}
 Version:        0.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A system for processing plaintext documentation
 
 Group:          Development/Languages
 # See COPYING.txt for information
 License:        Public Domain and MIT and Python and GPLv2
 URL:            http://docutils.sourceforge.net
-Source0:        http://dl.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
 Source1:        http://svn.berlios.de/viewcvs/*checkout*/docutils/trunk/docutils/tools/editors/emacs/rst.el?rev=5335
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:       noarch
 
 BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+
 Requires(missingok): python-imaging
 Provides: docutils = %{version}-%{release}
 Obsoletes: docutils < %{version}-%{release}
@@ -39,13 +45,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} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build
 
 
 %install
 rm -rf %{buildroot}
 
-%{__python} setup.py install --skip-build --root %{buildroot}
+%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}
 
 for file in %{buildroot}/%{_bindir}/*.py; do
     mv $file `dirname $file`/`basename $file .py`
@@ -76,8 +82,12 @@ rm -rf %{buildroot}
 %{_bindir}/*
 %{python_sitelib}/docutils/
 %{python_sitelib}/roman.*
+%{python_sitelib}/*egg-info/
 
 %changelog
+* Thu Sep 27 2007 Toshio Kuratomi <a.badger@gmail.com> 0.4-7
+- Build egg info.
+
 * Mon Aug 13 2007 Toshio Kuratomi <a.badger@gmail.com> 0.4-6
 - Last version had both the old and new rst.el.  Try again with only
   the new one.