diff -u conntrack-0.9.13/debian/control conntrack-0.9.13/debian/control
--- conntrack-0.9.13/debian/control
+++ conntrack-0.9.13/debian/control
@@ -1,7 +1,8 @@
 Source: conntrack
 Section: net
 Priority: optional
-Maintainer: netfilter maintainers <netfilter-maintainers@ned.snow-crash.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: netfilter maintainers <netfilter-maintainers@ned.snow-crash.org>
 Uploaders: Max Kellermann <max@duempel.org>, Alexander Wirt <formorer@debian.org>
 Homepage: http://conntrack-tools.netfilter.org/
 Build-Depends: debhelper (>= 5), libnfnetlink-dev (>= 1.0.0),
diff -u conntrack-0.9.13/debian/changelog conntrack-0.9.13/debian/changelog
--- conntrack-0.9.13/debian/changelog
+++ conntrack-0.9.13/debian/changelog
@@ -1,3 +1,11 @@
+conntrack (1:0.9.13-1.1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing.  Remaining changes: LP: #506831
+    - Error on fwrite failure in src/read_config_lex.c.
+    - Patch from Kees Cook to not ignore return value of chdir call.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Wed, 13 Jan 2010 10:36:40 +0530
+
 conntrack (1:0.9.13-1.1) unstable; urgency=high
 
   * Non-maintainer upload.
@@ -21,6 +29,15 @@
 
  -- Alexander Wirt <formorer@debian.org>  Thu, 17 Sep 2009 12:32:19 +0200
 
+conntrack (1:0.9.12-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #380358), remaining changes:
+    - Error on fwrite failure in src/read_config_lex.c.
+    - Patch from Kees Cook to not ignore return value of chdir call.
+  * debian/copyright: Updated download site.
+
+ -- Andres Rodriguez <andreserl@ubuntu.com>  Thu, 18 Jun 2009 18:27:31 -0500
+
 conntrack (1:0.9.12-1) unstable; urgency=low
 
   [ Max Kellermann ]
@@ -38,6 +55,34 @@
 
  -- Alexander Wirt <formorer@debian.org>  Thu, 02 Apr 2009 11:37:25 +0200
 
+conntrack (1:0.9.7-1.1ubuntu2) jaunty; urgency=low
+
+  * Patch from Kees Cook to not ignore return value of chdir call. Thanks
+    Kees (LP: #256380)
+  * Remove undef of _FORTIFY_SOURCE.
+  * Error on fwrite failure in src/read_config_lex.c.
+
+ -- James Westby <james.westby@canonical.com>  Mon, 24 Nov 2008 01:27:09 +0000
+
+conntrack (1:0.9.7-1.1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable (LP: 256380), remaining changes:
+    + #include <limits.h> in {main,ignore_pool}.c to get PATH_MAX and INT_MAX
+    + local.c: Fix insecure printf usage
+    + debian/rules: 
+      -undef _FORTIFY_SOURCE so that it doesn't fail about ignored chdir()
+      return value.
+
+ -- Manny Vindiola <mannyv@gmail.com>  Fri, 21 Nov 2008 18:36:33 -0500
+
+conntrack (1:0.9.7-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add casts to printf() statement in event_cb() to avoid a compiler
+    warning on sparc which results in build failure (Closes: #492813)
+
+ -- Jurij Smakov <jurij@debian.org>  Sat, 23 Aug 2008 20:51:33 +0100
+
 conntrack (1:0.9.7-1) unstable; urgency=low
 
   [ Max Kellermann ]
@@ -50,6 +95,17 @@
 
  -- Alexander Wirt <formorer@debian.org>  Tue, 22 Jul 2008 23:33:30 +0200
 
+conntrack (1:0.9.6-4ubuntu1) intrepid; urgency=low
+
+  * debian/patches: Add fix_includes_and_printf_usage.dpatch
+    - #include <limits.h> in {main,ignore_pool}.c to get PATH_MAX and INT_MAX
+    - local.c: Fix insecure printf usage
+  * debian/rules: undef _FORTIFY_SOURCE so that it doesn't fail about ignored
+    chdir() return value.
+  * Modify Maintainer value to match the DebianMaintainerField specification.
+
+ -- Albin Tonnerre <lutin@ubuntu.com>  Sun, 15 Jun 2008 18:39:30 +0200
+
 conntrack (1:0.9.6-4) unstable; urgency=low
 
   [ Max Kellermann ]
@@ -97,0 +154 @@
+
only in patch2:
unchanged:
--- conntrack-0.9.13.orig/src/read_config_lex.c
+++ conntrack-0.9.13/src/read_config_lex.c
@@ -4205,7 +4205,7 @@
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO if (fwrite( yytext, yyleng, 1, yyout )) yy_fatal_error (strerror (errno));
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
only in patch2:
unchanged:
--- conntrack-0.9.13.orig/src/main.c
+++ conntrack-0.9.13/src/main.c
@@ -333,7 +333,10 @@
 		exit(EXIT_FAILURE);
 	}
 
-	chdir("/");
+	if (chdir("/")<0) {
+		perror("chdir");
+		exit(EXIT_FAILURE);
+	}
 	close(STDIN_FILENO);
 
 	/* Daemonize conntrackd */