diff --git a/.cvsignore b/.cvsignore
index b601041..08f9c81 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,3 @@
-setuptools-0.6a10.zip
+setuptools-0.6b3.zip
+zpl.txt
+psfl.txt
diff --git a/python-setuptools.spec b/python-setuptools.spec
index 0eb465a..bc7ddf6 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -1,9 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-setuptools
-Version:        0.6a10
+Version:        0.6b3
 Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
@@ -11,39 +9,69 @@ Group:          Development/Languages
 License:        PSFL/ZPL
 URL:            http://peak.telecommunity.com/DevCenter/setuptools
 Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.zip
+Source1:		psfl.txt
+Source2:		zpl.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-Requires:       python-abi = %{pyver}
 
 %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.
 
+
 %prep
 %setup -q -n setuptools-%{version}
-sed -i '1s@#!python@#!/usr/bin/python@' easy_install.py
+find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
+
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed
-find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; -print | while read file ; do sed -i '1d' $file ; done
+%{__python} setup.py install -O1 --skip-build \
+	--root $RPM_BUILD_ROOT \
+	--single-version-externally-managed
+cp -a %{SOURCE1} %{SOURCE2} .
+find $RPM_BUILD_ROOT%{python_sitelib} -name '*.exe' | xargs rm -f
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
-%doc api_tests.txt EasyInstall.txt pkg_resources.txt setuptools.txt
+%doc *.txt
 %{_bindir}/*
-%{python_sitelib}/*
+%{python_sitelib}/*.egg-info
+%dir %{python_sitelib}/setuptools
+%dir %{python_sitelib}/setuptools/command
+%dir %{python_sitelib}/setuptools/tests
+%{python_sitelib}/*.py
+%{python_sitelib}/*/*.py
+%{python_sitelib}/*/*/*.py
+%{python_sitelib}/*.pyc
+%{python_sitelib}/*/*.pyc
+%{python_sitelib}/*/*/*.pyc
+%ghost %{python_sitelib}/*.pyo
+%ghost %{python_sitelib}/*/*.pyo
+%ghost %{python_sitelib}/*/*/*.pyo
+
 
 %changelog
+* Wed Jun 28 2006 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6b3-1
+- Taking over from Ignacio
+- Version 0.6b3
+- Ghost .pyo files in sitelib
+- Add license files
+- Remove manual python-abi, since we're building FC4 and up
+- Kill .exe files
+
 * Wed Feb 15 2006 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 0.6a10-1
 - Upstream update
 
diff --git a/sources b/sources
index 148ed67..e8c136c 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-8bcf7524d484aa3134a1b5aa64d2c275  setuptools-0.6a10.zip
+d199ec0b344db6d2f0ee3ff1eb38d0e0  setuptools-0.6b3.zip
+0f810c1ec4c50e3e0fe390d14a831d48  zpl.txt
+85f03c95710162ed140bc8fa22790b2a  psfl.txt