diff -u conky-1.6.1/debian/patches/move_compile_end_man_page conky-1.6.1/debian/patches/move_compile_end_man_page
--- conky-1.6.1/debian/patches/move_compile_end_man_page
+++ conky-1.6.1/debian/patches/move_compile_end_man_page
@@ -1,7 +1,7 @@
 Index: conky-1.6.1/doc/conky.1
 ===================================================================
---- conky-1.6.1.orig/doc/conky.1	2008-08-14 19:13:48.000000000 +0200
-+++ conky-1.6.1/doc/conky.1	2008-08-15 15:09:01.000000000 +0200
+--- conky-1.6.1.orig/doc/conky.1	2008-09-08 09:25:08.000000000 +0530
++++ conky-1.6.1/doc/conky.1	2008-09-08 09:25:17.000000000 +0530
 @@ -40,36 +40,6 @@
  or stop by #conky on irc.freenode.net if you have questions or want to contribute.
  .PP
diff -u conky-1.6.1/debian/patches/fix_hyphen_man_page conky-1.6.1/debian/patches/fix_hyphen_man_page
--- conky-1.6.1/debian/patches/fix_hyphen_man_page
+++ conky-1.6.1/debian/patches/fix_hyphen_man_page
@@ -1,7 +1,7 @@
 Index: conky-1.6.1/doc/conky.1
 ===================================================================
---- conky-1.6.1.orig/doc/conky.1	2008-08-15 15:11:58.000000000 +0200
-+++ conky-1.6.1/doc/conky.1	2008-08-15 15:17:14.000000000 +0200
+--- conky-1.6.1.orig/doc/conky.1	2008-09-08 09:25:17.000000000 +0530
++++ conky-1.6.1/doc/conky.1	2008-09-08 09:29:38.000000000 +0530
 @@ -44,7 +44,7 @@
  Conky is generally very good on resources. That said, the more you try to make Conky
  do, the more resources it is going to consume.
diff -u conky-1.6.1/debian/NEWS conky-1.6.1/debian/NEWS
--- conky-1.6.1/debian/NEWS
+++ conky-1.6.1/debian/NEWS
@@ -1,3 +1,12 @@
+conky (1.6.0-1) unstable; urgency=low
+
+    User's may find that older conky configuration files give
+    unexpected results. This is because some buffer sizes have been
+    "optimized". For the details about these changes please refer
+    to the man page.
+
+ -- Kapil Hari Paranjape <kapil@debian.org>  Tue, 09 Sep 2008 08:44:42 +0530
+
 conky (1.5.1-1) unstable; urgency=low
 
     The system default config file for conky is an external
diff -u conky-1.6.1/debian/changelog conky-1.6.1/debian/changelog
--- conky-1.6.1/debian/changelog
+++ conky-1.6.1/debian/changelog
@@ -1,3 +1,27 @@
+conky (1.6.1-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable (LP: #322035), remaining changes:
+    - fix_exec_buffer_size.patch
+      fix SIGSEGV due to wrong buffer size being used in all exec* calls.
+
+ -- Andrew Gee <andrew@andrewgee.org>  Tue, 27 Jan 2009 19:45:48 +0000
+
+conky (1.6.1-1) unstable; urgency=low
+
+  * New upstream release (1.6.1).
+  * debian/patches:
+    - man_page_typo_first_char: removed, incorporated upstream.
+    - fix_hyphen_man_page, move_compile_end_man_page: refreshed these
+      patches taking into account new changes to upstream man page.
+    - ifaddr_buffer_overflow: fix buffer overflow in
+      update_net_stats. Thanks to Miroslav Lichvar.
+  * debian/control: added "mpd" to Suggests.
+  * debian/NEWS: documented the need to re-examine the conky
+    configuration file for the changes since version 1.5.x.
+    Closes: #495864.
+
+ -- Kapil Hari Paranjape <kapil@debian.org>  Tue, 09 Sep 2008 12:33:28 +0530
+
 conky (1.6.1-0ubuntu3) intrepid; urgency=low
 
   * debian/patches: