diff --git a/python-dns.spec b/python-dns.spec
index a46419a..e019a62 100644
--- a/python-dns.spec
+++ b/python-dns.spec
@@ -2,7 +2,7 @@
 
 Name:           python-dns
 Version:        1.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DNS toolkit for Python
 
 Group:          Development/Languages
@@ -12,7 +12,11 @@ Source0:        http://www.dnspython.org/kits/%{version}/dnspython-%{version}.ta
 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
 
 %description
 dnspython is a DNS toolkit for Python. It supports almost all record
@@ -32,11 +36,11 @@ manipulation of DNS zones, messages, names, and records.
 find examples -type f | xargs chmod a-x
 
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' build
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}
 
 %check
 pushd tests
@@ -56,9 +60,13 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE README TODO examples
 
+%{python_sitelib}/*egg-info
 %{python_sitelib}/dns
 
 %changelog
+* Tue Oct  9 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.5.0-2
+- Follow new Python egg packaging specs
+
 * Thu Jan 11 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.5.0-1
 - Update to 1.5.0