diff --git a/offlineimap.spec b/offlineimap.spec
index afd420c..f30d5dd 100644
--- a/offlineimap.spec
+++ b/offlineimap.spec
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           offlineimap
-Version:        5.99.4
-Release:        2%{?dist}
+Version:        6.0.0
+Release:        1%{?dist}
 Summary:        Powerful IMAP/Maildir synchronization and reader support
 
 License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://software.complete.org/offlineimap/
-Source0:        http://software.complete.org/offlineimap/static/download_area/%{version}/%{name}_%{version}.tar.gz
+Source0:        http://ftp.de.debian.org/debian/pool/main/o/offlineimap/%{name}_%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -34,7 +34,6 @@ not provide disconnected operation.
 
 %build
 python setup.py build
-cp -p debian/changelog ChangeLog
 docbook2man offlineimap.sgml
 
 
@@ -53,19 +52,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-#%doc manual.* todo
 %doc README COPY* UPGRADING offlineimap.conf* FAQ.html
-%doc ChangeLog
+%doc debian/changelog
 %{_bindir}/offlineimap
 %{python_sitelib}/offlineimap/
+%{python_sitelib}/offlineimap-%{version}-py*.egg-info
 %{_mandir}/man1/offlineimap.1.gz
 
 
 %changelog
-* Tue Jan 08 2008 Till Maas <opensource till name> - 5.99.4-2
-- change release because of make tag issues
+* Wed Jun 18 2008 Till Maas <opensource till name> - 6.0.0-1
+- Update to latest release
 
-* Tue Jan 08 2008 Till Maas <opensource till name> - 5.99.4-1
+* Tue Mar 04 2008 Till Maas <opensource till name> - 5.99.7-1
+- Update to latest version
+
+* Tue Mar 04 2008 Till Maas <opensource till name> - 5.99.6-1
+- Update to latest version
+
+* Mon Jan 07 2008 Till Maas <opensource till name> - 5.99.4-2
+- add egg-info to %%files
+
+* Sun Oct 21 2007 Till Maas <opensource till name> - 5.99.4-1
 - update to new version
 
 * Tue Sep 04 2007 Till Maas <opensource till name> - 5.99.2-1
diff --git a/sources b/sources
index 39580a9..2492474 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-077f861f164d73aee2eb5df6b975415e  offlineimap_5.99.4.tar.gz
+5e9cd283a5ca605af1fad88b1dcaa91d  offlineimap_6.0.0.tar.gz