diff --git a/python-venusian.spec b/python-venusian.spec
index 216aa13..0d93525 100644
--- a/python-venusian.spec
+++ b/python-venusian.spec
@@ -1,25 +1,34 @@
+%if 0%{?fedora} > 12
+%global with_python3 1
+%endif
+
 %global modname venusian
 %global alphaver a7
 
 Name:           python-%{modname}
 Version:        1.0
-Release:        0.5.%{alphaver}%{?dist}
+Release:        0.1.%{alphaver}%{?dist}
 Summary:        A library for deferring decorator actions
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://pypi.python.org/pypi/venusian
 Source0:        http://pypi.python.org/packages/source/v/venusian/%{modname}-%{version}%{alphaver}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  python-setuptools-devel
 BuildRequires:  python2-devel
 BuildRequires:  python-nose
 BuildRequires:  python-nose-exclude
+
+
+%if 0%{?with_python3}
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-nose
 BuildRequires:  python3-nose-exclude
+%endif
 
 
 %description
@@ -29,6 +38,7 @@ executed at import time, you can defer the action usually taken by the
 decorator until a separate "scan" phase.
 
 
+%if 0%{?with_python3}
 %package -n python3-venusian
 Summary:        A library for deferring decorator actions
 Group:          Development/Libraries
@@ -38,53 +48,66 @@ Venusian is a library which allows framework authors to defer decorator
 actions.  Instead of taking actions when a function (or class) decorator is
 executed at import time, you can defer the action usually taken by the
 decorator until a separate "scan" phase.
+%endif
 
 %prep
 %setup -q -n %{modname}-%{version}%{alphaver}
 
 # Remove bundled egg info if it exists
 rm -rf %{modname}.egg-info
+
+%if 0%{?with_python3}
 rm -rf %{py3dir}
 cp -a . %{py3dir}
+%endif
 
 %build
-python setup.py build
+%{__python} setup.py build
 
+%if 0%{?with_python3}
 pushd %{py3dir}
-python3 setup.py build
+%{__python3} setup.py build
 popd
+%endif
 
 %install
+rm -rf %{buildroot}
+
+%if 0%{?with_python3}
 pushd %{py3dir}
-python3 setup.py install -O1 --skip-build --root %{buildroot}
+%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
 popd
+%endif
 
-python setup.py install -O1 --skip-build --root %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 %check
+%if 0%{?with_python3}
 pushd %{py3dir}
-python3 setup.py nosetests
+%{__python3} setup.py nosetests
 popd
+%endif
+
+%{__python} setup.py nosetests
 
-python setup.py nosetests
+%clean
+rm -rf %{buildroot}
 
 %files
+%defattr(-,root,root,-)
 %doc README.txt LICENSE.txt
 %{python_sitelib}/%{modname}/
 %{python_sitelib}/%{modname}-%{version}*.egg-info
 
+%if 0%{?with_python3}
 %files -n python3-venusian
 %doc README.txt LICENSE.txt
 %{python3_sitelib}/%{modname}/
 %{python3_sitelib}/%{modname}-%{version}*.egg-info
+%endif
 
 
 %changelog
-* Thu Feb 21 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1.0-0.5.a7
-- Bump release so a7 is higher than the a3 in F18+
-- Drop Fedora 12 conditionals as it's long gone
-- Modernise spec
-
 * Fri Jan 18 2013 Ralph Bean <rbean@redhat.com> - 1.0-0.1.a7
 - Latest upstream version
 - Python3 subpackage