diff --git a/python-nose.spec b/python-nose.spec
index 10d774a..11da3ef 100644
--- a/python-nose.spec
+++ b/python-nose.spec
@@ -1,5 +1,7 @@
+%if 0%{?fedora} < 13 && 0%{?rhel} < 5
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+%{!?python_version: %global python_version %(%{__python} -c "import sys ; print sys.version[:3]")}
+%endif
 
 %global upstream_name nose
 
@@ -9,12 +11,19 @@ Release:        3%{?dist}
 Summary:        A discovery-based unittest extension for Python
 
 Group:          Development/Languages
-License:        LGPLv2
-URL:            http://code.google.com/p/python-nose/
-Source0:        http://pypi.python.org/packages/source/n/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
+License:        LGPLv2+ and Public Domain
+URL:            http://somethingaboutorange.com/mrl/projects/nose/
+Source0:        http://somethingaboutorange.com/mrl/projects/nose/nose-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel python-setuptools-devel
+BuildRequires:  python2-devel
+%if 0%{?fedora} && 0%{?fedora} < 13
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+BuildRequires: dos2unix
 Requires:       python-setuptools
 
 %description
@@ -45,6 +54,7 @@ Documentation for Nose
 %prep
 %setup -q -n %{upstream_name}-%{version}
 
+dos2unix examples/attrib_plugin.py
 
 %build
 %{__python} setup.py build
@@ -52,7 +62,7 @@ Documentation for Nose
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot} \
+%{__python} setup.py install --skip-build --root %{buildroot} \
            --install-data=%{_datadir}
 
 pushd doc
@@ -76,14 +86,13 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG html lgpl.txt NEWS README.txt
 %{_bindir}/nosetests
-%{_bindir}/nosetests-%{pyver}
+%{_bindir}/nosetests-%{python_version}
 %{_mandir}/man1/nosetests.1.gz
-%{python_sitelib}/nose-%{version}-py%{pyver}.egg-info
-%{python_sitelib}/nose
+%{python_sitelib}/nose*
 
 %files docs
 %defattr(-,root,root,-)
-%doc html reST
+%doc html reST examples
 
 %changelog
 * Thu May 20 2010 Luke Macken <lmacken@redhat.com> - 0.11.3-3