diff --git a/debian/changelog b/debian/changelog
index 6724291..5d55b9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+offlineimap (4.0.13-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update package to the last python policy (Closes: #380880):
+    + only build for python current (use python-dev).
+    + use dh_pysupport.
+  * Bump Standards-Version to 3.7.2.
+  * Bump DH_COMPAT to 4.
+  * Move debhelper into Build-Depends.
+  * Fix old FSF address.
+
+ -- Pierre Habouzit <madcoder@debian.org>  Fri, 11 Aug 2006 19:05:06 +0200
+
 offlineimap (4.0.13) unstable; urgency=low
 
   * Revert restoreatime patch; it didn't work with IMAP on local.
@@ -779,6 +792,3 @@ offlineimap (1.0.0) unstable; urgency=low
 
  -- John Goerzen <jgoerzen@complete.org>  Fri, 21 Jun 2002 18:54:56 -0500
 
-Local variables:
-mode: debian-changelog
-End:
diff --git a/debian/control b/debian/control
index 20186ad..4aaa9af 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,15 @@ Source: offlineimap
 Section: mail
 Priority: optional
 Maintainer: John Goerzen <jgoerzen@complete.org>
-Build-Depends-Indep: debhelper (>> 4.2.0), python2.3, python2.3-dev (>= 2.2.2), groff, docbook-utils, python (>= 2.3), python-dev (>= 2.3)
+Build-Depends: debhelper (>> 4.2.0)
+Build-Depends-Indep: python-dev, groff, docbook-utils, python-support (>= 0.4.0)
 Build-Conflicts-Indep: docbook-ebnf
-Standards-Version: 3.5.2
+Standards-Version: 3.7.2
 
 Package: offlineimap
 Architecture: all
-Depends: python2.3
-Suggests: python2.3-tk
+Depends: ${python:Depends}
+Suggests: python-tk
 Description: IMAP/Maildir synchronization and reader support
  OfflineIMAP is a tool to simplify your e-mail reading.  With
  OfflineIMAP, you can:
diff --git a/debian/copyright b/debian/copyright
index 9488578..3ce0ef7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,6 +18,7 @@ Copyright (C) 2002 - 2005 John Goerzen
 
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the  Free Software Foundation, Inc., 51 Franklin St,
+  Fifth Floor, Boston, MA 02110-1301, USA.
+
 
diff --git a/debian/rules b/debian/rules
index 0cec54c..b5da985 100644
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,9 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=3
+export DH_COMPAT=4
 
-PYTHON=python2.3
+PYTHON=python
 PACKAGE=offlineimap
 
 
@@ -88,7 +88,7 @@ binary-indep: build install
 	dh_compress
 	dh_fixperms
 #	dh_perl
-	dh_python
+	dh_pysupport
 #	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps