diff --git a/python-six.changes b/python-six.changes
index ca4db64..6cf5782 100644
--- a/python-six.changes
+++ b/python-six.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 30 07:41:52 UTC 2013 - speilicke@suse.com
+
+- Run testsuite
+- Build and package HTML documentation
+
 -------------------------------------------------------------------
 Mon Apr 29 11:14:05 UTC 2013 - dmueller@suse.com
 
diff --git a/python-six.spec b/python-six.spec
index c465559..d0603d5 100644
--- a/python-six.spec
+++ b/python-six.spec
@@ -17,16 +17,21 @@
 
 
 %define modname six
-Name:           python-%{modname}
+Name:           python-six
 Version:        1.3.0
 Release:        0
 Url:            http://pypi.python.org/pypi/six/
 Summary:        Python 2 and 3 compatibility utilities
 License:        MIT
 Group:          Development/Libraries/Python
-Source:         http://pypi.python.org/packages/source/s/%{modname}/%{modname}-%{version}.tar.gz
+Source:         http://pypi.python.org/packages/source/s/six/six-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
+# Documentation requirements:
+BuildRequires:  python-Sphinx
+# Test requirements:
+BuildRequires:  python-py
+BuildRequires:  python-pytest
 %if 0%{?suse_version} <= 1110
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %else
@@ -42,18 +47,22 @@ both Python versions. See the documentation for more information on
 what is provided.
 
 %prep
-%setup -q -n %{modname}-%{version}
+%setup -q -n six-%{version}
 
 %build
 python setup.py build
+cd documentation && make html && rm _build/html/.buildinfo
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
+%check
+python test_six.py
+
 %files
 %defattr(-,root,root)
-%doc LICENSE README
-%{python_sitelib}/%{modname}.py*
-%{python_sitelib}/%{modname}-%{version}-py%{py_ver}.egg-info
+%doc LICENSE README documentation/_build/html
+%{python_sitelib}/six.py*
+%{python_sitelib}/six-%{version}-py%{py_ver}.egg-info
 
 %changelog