diff --git a/.gitignore b/.gitignore
index b178cea..dc8c693 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /zope.exceptions-3.6.1.zip
+/zope.exceptions-4.0.3.zip
diff --git a/python-zope-exceptions.spec b/python-zope-exceptions.spec
index 1998e0d..110549a 100644
--- a/python-zope-exceptions.spec
+++ b/python-zope-exceptions.spec
@@ -1,37 +1,83 @@
 %global modname zope.exceptions
 
-Summary: Zope Exceptions
-Name: python-zope-exceptions
-Version: 3.6.1
-Release: 9%{?dist}
-Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.zip
-License: ZPLv2.1
-Group: Development/Libraries
-BuildArch: noarch
-URL: http://cheeseshop.python.org/pypi/zope.exceptions
-
-BuildRequires: python2-devel
-BuildRequires: python-setuptools
-# for the tests
-BuildRequires: python-zope-interface
-Requires: python-zope-interface
+%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%global with_python3 1
+%endif
+
+Summary:    Zope Exceptions
+Name:       python-zope-exceptions
+Version:    4.0.3
+Release:    1%{?dist}
+Source0:    http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.zip
+License:    ZPLv2.1
+Group:      Development/Libraries
+BuildArch:  noarch
+URL:        http://pypi.python.org/pypi/zope.exceptions
+
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
+BuildRequires:  python-zope-interface
+
+%if 0%{?with_python3}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-zope-interface
+%endif
+
+Requires:       python-zope-interface
 
 %description
 This package contains exception interfaces and implementations which are so
 general purpose that they don't belong in Zope application-specific packages.
 
+%if 0%{?with_python3}
+%package -n python3-zope-exceptions
+Summary:    Zope Exceptions
+Group:      Development/Libraries
+
+Requires:   python3-zope-interface
+
+%description -n python3-zope-exceptions
+This package contains exception interfaces and implementations which are so
+general purpose that they don't belong in Zope application-specific packages.
+%endif
+
 %prep
 %setup -q -n %{modname}-%{version}
 
+rm -rf %{modname}.egg-info
+
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif
+
 %build
 %{__python} setup.py build
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif
 
 %install
-%{__python} setup.py install --root=$RPM_BUILD_ROOT
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
+popd
+%endif
+
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 %check
 %{__python} setup.py test
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py test
+popd
+%endif
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.txt CHANGES.txt README.txt COPYRIGHT.txt
@@ -42,8 +88,24 @@ general purpose that they don't belong in Zope application-specific packages.
 %{python_sitelib}/%{modname}-*.egg-info
 %{python_sitelib}/%{modname}-*-nspkg.pth
 
+%if 0%{?with_python3}
+%files -n python3-zope-exceptions
+%doc LICENSE.txt CHANGES.txt README.txt COPYRIGHT.txt
+%{python3_sitelib}/zope/exceptions/
+# Co-own %%{python3_sitelib}/zope/
+%dir %{python3_sitelib}/zope/
+%exclude %{python3_sitelib}/zope/exceptions/tests/
+%{python3_sitelib}/%{modname}-*.egg-info
+%{python3_sitelib}/%{modname}-*-nspkg.pth
+%endif
+
 
 %changelog
+* Tue Dec 11 2012 Ralph Bean <rbean@redhat.com> - 4.0.3-1
+- Latest upstream.
+- Packaged a python3 subpackage.
+- Made indentation consistent.
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.6.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 7be2eaf..f7e124d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b735a62e1ef16e746764b4938a4d7926  zope.exceptions-3.6.1.zip
+893532486e1648d43798fc5ebd5ce5a1  zope.exceptions-4.0.3.zip