diff --git a/.cvsignore b/.cvsignore
index de480b7..f7c9184 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-configobj-4.7.0.tar.gz
+configobj-4.7.0.zip
diff --git a/python-configobj.spec b/python-configobj.spec
index bd8d80f..edc4d75 100644
--- a/python-configobj.spec
+++ b/python-configobj.spec
@@ -3,17 +3,17 @@
 
 Name:           python-configobj
 Version:        4.7.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Config file reading, writing, and validation
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.voidspace.org.uk/python/configobj.html
-Source0:        http://pypi.python.org/packages/source/c/configobj/configobj-%{version}.tar.gz
+Source0:        http://www.voidspace.org.uk/downloads/configobj-%{version}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires: python-devel python-setuptools-devel
+BuildRequires: python-devel
 
 %description
 ConfigObj is a simple but powerful config file reader and writer: an ini file
@@ -47,22 +47,27 @@ It has lots of other features though:
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 
+%check
+export PYTHONPATH="%{buildroot}/%{python_sitelib}"
+%{__python} tests/test_configobj.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
-%doc
-%{python_sitelib}/*.py
-%{python_sitelib}/*.pyc
-%{python_sitelib}/*.pyo
-%if 0%{?fedora} >= 9
-%{python_sitelib}/*.egg-info
-%endif
+%doc docs/*
+%{python_sitelib}/*
 
 %changelog
+* Wed Jan 20 2010 Luke Macken <lmacken@redhat.com> - 4.7.0-2
+- Merge a bunch of changes from Gareth Armstrong <gareth.armstrong@hp.com>
+    - The src zip file should come either from http://www.voidspace.org.uk/
+      downloads/ or http://code.google.com/p/configobj/ as the PyPI tarball is
+      not complete.  No docs and no test code.
+    - Added docs
+    - Remove BR on python-setuptools-devel
+
 * Sun Jan 10 2010 Luke Macken <lmacken@redhat.com> - 4.7.0-1
 - Update to 4.7.0
 
diff --git a/sources b/sources
index 8f3a8c5..ba55c62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b6a56f0f889285d2bbc8f2e7ca7c37b  configobj-4.7.0.tar.gz
+237bb4ffd4eaa6208805138499806421  configobj-4.7.0.zip