diff -Nru /tmp/jbxaG0olD3/apport-0.60/bin/apport /tmp/gKTMmpzKPA/apport-0.61/bin/apport
--- /tmp/jbxaG0olD3/apport-0.60/bin/apport	2007-02-22 16:52:04.000000000 +0100
+++ /tmp/gKTMmpzKPA/apport-0.61/bin/apport	2007-02-27 16:00:55.000000000 +0100
@@ -121,6 +121,13 @@
     else:
         assert limit is None
 
+    # limit -1 means 'unlimited'
+    if limit < 0:
+        limit = None
+    else:
+        # ulimit specifies kB
+        limit *= 1024
+
     core_path = os.path.join(cwd, 'core')
     try:
         if open('/proc/sys/kernel/core_uses_pid').read().strip() != '0':
diff -Nru /tmp/jbxaG0olD3/apport-0.60/debian/changelog /tmp/gKTMmpzKPA/apport-0.61/debian/changelog
--- /tmp/jbxaG0olD3/apport-0.60/debian/changelog	2007-02-26 20:58:50.000000000 +0100
+++ /tmp/gKTMmpzKPA/apport-0.61/debian/changelog	2007-02-27 16:09:33.000000000 +0100
@@ -1,3 +1,13 @@
+apport (0.61) feisty; urgency=low
+
+  * bin/apport:
+    - Kernel 2.6.20-9 now sets CORE_REAL_RLIM to -1 instead of not setting it;
+      handle this case correctly. (LP: #87065)
+    - Add forgotten multiplication of CORE_REAL_RLIM with 1024, since ulimit
+      sets kB, not bytes.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 27 Feb 2007 16:06:11 +0100
+
 apport (0.60) feisty; urgency=low
 
   * gtk/apport-gtk.glade: Reintroduce window titles. Since the crash
diff -Nru /tmp/jbxaG0olD3/apport-0.60/TODO /tmp/gKTMmpzKPA/apport-0.61/TODO
--- /tmp/jbxaG0olD3/apport-0.60/TODO	2007-02-22 16:06:05.000000000 +0100
+++ /tmp/gKTMmpzKPA/apport-0.61/TODO	2007-02-27 08:30:09.000000000 +0100
@@ -11,6 +11,8 @@
  - Add API/report attribute for doing upstream problem reports
  - support /etc/apport/blacklist.d/ for check_ignored(): one exe
    per line
+ - mention system arch mismatch on Architecture: and alter default bug
+   title
 
 add firefox apport hook to suppress crash reports when restart is
 necessary