diff --git a/.cvsignore b/.cvsignore
index ec5bc39..b13025b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1 @@
-dbus-python-0.70.tar.gz
-dbus-python-0.80.1.tar.gz
-dbus-python-0.80.2.tar.gz
+dbus-python-0.82.0.tar.gz
diff --git a/dbus-python.spec b/dbus-python.spec
index 0f419b1..657b7d9 100644
--- a/dbus-python.spec
+++ b/dbus-python.spec
@@ -6,11 +6,10 @@
 
 Summary: D-Bus Python Bindings 
 Name: dbus-python
-Version: 0.80.2
-Release: 3%{?dist}
+Version: 0.82.0
+Release: 1%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
-Patch0: dbus-python-0.80.2-examine-args.patch
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -35,7 +34,6 @@ bindings.
 
 %prep
 %setup -q
-%patch -p 1 -b .examine-args
 
 %build
 %configure
@@ -59,14 +57,9 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 
-%doc COPYING ChangeLog
-%docdir /usr/share/doc/dbus-python
-%{_docdir}/dbus-python/API_CHANGES.txt
-%{_docdir}/dbus-python/HACKING.txt
-%{_docdir}/dbus-python/NEWS
-%{_docdir}/dbus-python/README
-%{_docdir}/dbus-python/TODO
-%{_docdir}/dbus-python/tutorial.txt
+%doc COPYING ChangeLog README NEWS TODO
+%doc doc/API_CHANGES.txt doc/HACKING.txt doc/tutorial.txt
+%exclude %{_datadir}/doc/dbus-python
 
 %dir %{python_sitelib}/dbus
 %dir %{python_sitelib}/dbus/mainloop
@@ -82,6 +75,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/dbus-python.pc
 
 %changelog
+* Fri Jun 22 2007 Matthias Clasen <mclasen@redhat.com> - 0.82.0-1
+- Update to 0.82.0
+- Put all docs in the usual place
+
 * Tue Apr 03 2007 David Zeuthen <davidz@redhat.com> - 0.80.2-3
 - Rebuild
 
diff --git a/sources b/sources
index 60200e2..a5c5f61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2807bc85215c995bd595e01edd9d2077  dbus-python-0.80.2.tar.gz
+024522ffba612f0d41b64269e925835c  dbus-python-0.82.0.tar.gz