diff --git a/.gitignore b/.gitignore
index 6d874ff..f4fef9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 zope.event-3.5.0-1.tar.gz
+/zope.event-3.5.1.tar.gz
diff --git a/python-zope-event.spec b/python-zope-event.spec
index 96ce4f1..a1e3206 100644
--- a/python-zope-event.spec
+++ b/python-zope-event.spec
@@ -1,18 +1,19 @@
 Name:           python-zope-event
-Version:        3.5.0.1
-Release:        5%{?dist}
+Version:        3.5.1
+Release:        1%{?dist}
 Summary:        Zope Event Publication
 Group:          Development/Languages
 License:        ZPLv2.1
 URL:            http://pypi.python.org/pypi/zope.event/
 # Upstream accidentally used strange version
-Source0:        http://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.0-1.tar.gz
+Source0:        http://pypi.python.org/packages/source/z/zope.event/zope.event-%{version}.tar.gz
 BuildArch:      noarch
 
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
-BuildRequires:  python-zope-testing
-
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python-sphinx
 
 %description
 The zope.event package provides a simple event system. It provides
@@ -21,35 +22,71 @@ on which more sophisticated event dispatching systems can be built.
 (For example, a type-based event dispatching system that builds on
 zope.event can be found in zope.component.)
 
+This package contains the version for Python 2.
+
+%package -n python3-zope-event
+Summary:        Zope Event Publication (Python 3)
+
+%description -n python3-zope-event
+The zope.event package provides a simple event system. It provides
+an event publishing system and a very simple event-dispatching system
+on which more sophisticated event dispatching systems can be built.
+(For example, a type-based event dispatching system that builds on
+zope.event can be found in zope.component.)
+
+This package contains the version for Python 3.
 
 %prep
-%setup -q -n zope.event-3.5.0-1
+%setup -q -n zope.event-%{version}
 
 
 %build
 %{__python} setup.py build
+%{__python3} setup.py build
+
+# build the sphinx documents
+pushd docs
+PYTHONPATH=../src make html
+rm -f _build/html/.buildinfo
+popd
 
 
 %install
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/event/*.txt
-
+%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
 %check
 %{__python} setup.py test
-
+%{__python3} setup.py test
  
 %files
-%defattr(-,root,root,-)
-%doc CHANGES.txt COPYRIGHT.txt LICENSE.txt
-%doc src/zope/event/*.txt
+%doc CHANGES.txt COPYRIGHT.txt LICENSE.txt README.txt
+%doc docs/_build/html/
 %{python_sitelib}/zope/event/
+%exclude %{python_sitelib}/zope/event/tests.py*
 %dir %{python_sitelib}/zope/
 %{python_sitelib}/zope.event-*.egg-info
 %{python_sitelib}/zope.event-*-nspkg.pth
 
+%files -n python3-zope-event
+%doc CHANGES.txt COPYRIGHT.txt LICENSE.txt README.txt
+%doc docs/_build/html/
+%{python3_sitelib}/zope/event/
+%exclude %{python3_sitelib}/zope/event/tests.py*
+%exclude %{python3_sitelib}/zope/event/__pycache__/
+%dir %{python3_sitelib}/zope/
+%{python3_sitelib}/zope.event-*.egg-info
+%{python3_sitelib}/zope.event-*-nspkg.pth
+
+
 
 %changelog
+* Thu Sep  1 2011 Robin Lee <cheeselee@fedoraproject.org> - 3.5.1-1
+- Update to 3.5.1 (#728489)
+- Build subpackage for Python 3.
+- Include the sphinx documents
+- Exclude the module for tests.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 4a3e789..9d9338a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5940673553add7a75ec47d3b916ba7d1  zope.event-3.5.0-1.tar.gz
+f18363bf9926f1762fa580cc69bd97ec  zope.event-3.5.1.tar.gz