diff -Nru fetchmail-6.3.17/debian/changelog fetchmail-6.3.17/debian/changelog
--- fetchmail-6.3.17/debian/changelog	2010-08-05 11:00:37.000000000 +0200
+++ fetchmail-6.3.17/debian/changelog	2010-12-26 02:01:16.000000000 +0100
@@ -1,3 +1,11 @@
+fetchmail (6.3.17-4ubuntu1.1) maverick-proposed; urgency=low
+
+  * debian/patches/04_fetchmailconf_python2.6.patch: Fix python module
+    path for fetchmailconf. Cherry-pick from natty/sid.
+    (LP: #669066, Closes: #603861)
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Sun, 26 Dec 2010 01:51:37 +0100
+
 fetchmail (6.3.17-4ubuntu1) maverick; urgency=low
 
   * Merge from Debian unstable, remaining changes: (LP: #609634)
diff -Nru fetchmail-6.3.17/debian/patches/04_fetchmailconf_python2.6.patch fetchmail-6.3.17/debian/patches/04_fetchmailconf_python2.6.patch
--- fetchmail-6.3.17/debian/patches/04_fetchmailconf_python2.6.patch	1970-01-01 01:00:00.000000000 +0100
+++ fetchmail-6.3.17/debian/patches/04_fetchmailconf_python2.6.patch	2010-12-26 01:59:46.000000000 +0100
@@ -0,0 +1,32 @@
+From: Artur Rona <ari-tczew@ubuntu.com>
+Description: Fix python module path for fetchmailconf.
+Bug-Ubuntu: https://launchpad.net/bugs/669066
+Bug-Debian: http://bugs.debian.org/603861
+Author: Nico Golde <nion@debian.org> 
+
+Index: fetchmail-6.3.18/Makefile.am
+===================================================================
+--- fetchmail-6.3.18.orig/Makefile.am	2010-12-01 23:19:32.000000000 +0100
++++ fetchmail-6.3.18/Makefile.am	2010-12-01 23:19:58.000000000 +0100
+@@ -191,7 +191,7 @@
+ 		Doxyfile
+ 
+ fetchmailconf:
+-	( echo '#! /bin/sh' && echo 'exec @PYTHON@ /usr/lib/`pyversions -d`/site-packages/fetchmailconf.py "$$@"' ) >$@ && chmod +x $@ || { rm -f $@ ; exit 1; }
++	( echo '#! /bin/sh' && echo 'exec @PYTHON@ /usr/lib/`pyversions -d`/dist-packages/fetchmailconf.py "$$@"' ) >$@ && chmod +x $@ || { rm -f $@ ; exit 1; }
+ 
+ FAQ: fetchmail-FAQ.html $(srcdir)/dist-tools/html2txt
+ 	AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/fetchmail-FAQ.html >$@ || { rm -f $@ ; exit 1 ; }
+Index: fetchmail-6.3.18/Makefile.in
+===================================================================
+--- fetchmail-6.3.18.orig/Makefile.in	2010-12-01 23:19:31.000000000 +0100
++++ fetchmail-6.3.18/Makefile.in	2010-12-01 23:19:42.000000000 +0100
+@@ -1695,7 +1695,7 @@
+ 	$(srcdir)/specgen.sh $(VERSION) >fetchmail.spec
+ 
+ fetchmailconf:
+-	( echo '#! /bin/sh' && echo 'exec @PYTHON@ /usr/lib/`pyversions -d`/site-packages/fetchmailconf.py "$$@"' ) >$@ && chmod +x $@ || { rm -f $@ ; exit 1; }
++	( echo '#! /bin/sh' && echo 'exec @PYTHON@ /usr/lib/`pyversions -d`/dist-packages/fetchmailconf.py "$$@"' ) >$@ && chmod +x $@ || { rm -f $@ ; exit 1; }
+ 
+ FAQ: fetchmail-FAQ.html $(srcdir)/dist-tools/html2txt
+ 	AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/fetchmail-FAQ.html >$@ || { rm -f $@ ; exit 1 ; }
diff -Nru fetchmail-6.3.17/debian/patches/series fetchmail-6.3.17/debian/patches/series
--- fetchmail-6.3.17/debian/patches/series	2010-06-27 14:37:15.000000000 +0200
+++ fetchmail-6.3.17/debian/patches/series	2010-12-26 01:51:05.000000000 +0100
@@ -1,3 +1,4 @@
 01_fetchmailconf.patch
 02_man_page.patch
 03_spurious-ssl-cert-warning.patch
+04_fetchmailconf_python2.6.patch