diff --git a/python-setuptools.spec b/python-setuptools.spec
index 42d3453..4aeb021 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -2,11 +2,11 @@
 
 Name:           python-setuptools
 Version:        0.6c6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
-Group:          Development/Languages
-License:        PSFL/ZPL
+Group:          Applications/System
+License:        Python or ZPLv2.0
 URL:            http://peak.telecommunity.com/DevCenter/setuptools
 Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
 Source1:        psfl.txt
@@ -16,13 +16,28 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
 
+%description
+setuptools is a collection of enhancements to the Python distutils that allow
+you to more easily build and distribute Python packages, especially ones that
+have dependencies on other packages.
+
+This package contains the runtime components of setuptools, necessary to
+execute the software that requires pkg_resources.py.
+
+%package devel
+Summary:        Download, install, upgrade, and uninstall Python packages
+Group:          Development/Languages
 Requires:       python-devel
+Requires:       %{name} = %{version}-%{release}
 
-%description
+%description devel
 setuptools is a collection of enhancements to the Python distutils that allow
 you to more easily build and distribute Python packages, especially ones that
 have dependencies on other packages.
 
+This package contains the components necessary to build and install software
+requiring setuptools.
+
 
 %prep
 %setup -q -n setuptools-%{version}
@@ -34,11 +49,18 @@ find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 
+%check
+%{__python} setup.py test
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build \
     --root $RPM_BUILD_ROOT \
     --single-version-externally-managed
+
+rm -rf $RPM_BUILD_ROOT%{python_sitelib}/setuptools/tests
+
 install -p -m 0644 %{SOURCE1} %{SOURCE2} .
 find $RPM_BUILD_ROOT%{python_sitelib} -name '*.exe' | xargs rm -f
 find $RPM_BUILD_ROOT%{python_sitelib} -name '*.txt' | xargs chmod -x
@@ -51,12 +73,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc *.txt
-%{_bindir}/*
+%doc psfl.txt zpl.txt pkg_resources.txt
+%{python_sitelib}/pkg_resources.py*
+
+%files devel
+%defattr(-,root,root,-)
+%doc psfl.txt zpl.txt EasyInstall.txt README.txt api_tests.txt setuptools.txt
 %{python_sitelib}/*
+%exclude %{python_sitelib}/pkg_resources.py*
+%{_bindir}/*
 
 
 %changelog
+* Sat Aug 18 2007 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c6-2
+- Make license tag conform to the new Licensing Guidelines
+- Move everything except pkg_resources.py into a separate -devel package
+  so we avoid bundling python-devel when it's not required (#251645)
+- Do not package tests
+
 * Sun Jun 10 2007 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c6-1
 - Upstream 0.6c6
 - Require python-devel (#240707)