diff --git a/python-zope.event.changes b/python-zope.event.changes
index d02277d..f774e9b 100644
--- a/python-zope.event.changes
+++ b/python-zope.event.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Jul 30 10:45:21 UTC 2013 - hpj@urpla.net
+
+- spell out upstream URL in Source:
+
+-------------------------------------------------------------------
+Mon Jul 29 13:43:57 UTC 2013 - hpj@urpla.net
+
+- generate documantation in separate -doc package
+- replace bz2 tarball with original gz without trailing garbarge
+
 -------------------------------------------------------------------
 Fri Mar 15 13:53:40 UTC 2013 - speilicke@suse.com
 
diff --git a/python-zope.event.spec b/python-zope.event.spec
index e3d4ae7..d791c40 100644
--- a/python-zope.event.spec
+++ b/python-zope.event.spec
@@ -23,12 +23,12 @@ Summary:        Very basic event publishing system
 License:        ZPL-2.1
 Group:          Development/Libraries/Python
 Url:            http://pypi.python.org/pypi/zope.event
-Source:         zope.event-%{version}.tar.bz2
+Source:         https://pypi.python.org/packages/source/z/zope.event/zope.event-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
 BuildRequires:  python-distribute
 # Documentation requirements:
-#BuildRequires:  python-Sphinx
+BuildRequires:  python-Sphinx
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %else
@@ -44,14 +44,23 @@ 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.
 
+%package doc
+Summary:        Very basic event publishing system
+Group:          Development/Languages/Python
+Requires:       %{name} = %{version}
+
+%description doc
+This package contains documentation files for %{name}.
 
 %prep
 %setup -q -n zope.event-%{version}
 
 %build
 python setup.py build
-# Doc build is self-referential, i.e. move to a seperate spec to require this one:
-#python setup.py build_sphinx
+# cannot give build/lib here, as pkg_resources.py needs the egg info and
+# raises DistributionNotFound for zope.event, hence build doc directly
+# from source in order to avoid the need for an external doc package
+PYTHONPATH=$(pwd)/src python setup.py build_sphinx && rm build/sphinx/html/.buildinfo
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
@@ -61,7 +70,11 @@ python setup.py test
 
 %files
 %defattr(-,root,root)
-%doc COPYRIGHT.txt LICENSE.txt README.txt
+%doc CHANGES.txt COPYRIGHT.txt LICENSE.txt README.txt
 %{python_sitelib}/*
 
+%files doc
+%defattr(-,root,root,-)
+%doc build/sphinx/html/
+
 %changelog
diff --git a/zope.event-4.0.2.tar.bz2 b/zope.event-4.0.2.tar.bz2
deleted file mode 100644
index 82c0476..0000000
--- a/zope.event-4.0.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35ba0c077e656913125514700f2f20127d3f8c2c3bda3603134950eb0e0cef18
-size 20480
diff --git a/zope.event-4.0.2.tar.gz b/zope.event-4.0.2.tar.gz
new file mode 100644
index 0000000..8d6b43f
--- /dev/null
+++ b/zope.event-4.0.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f19691a70cf1a1394b3886fc5fd54e48644cf54943b50995dc90c2e514e5662b
+size 13261