diff --git a/debian/changelog b/debian/changelog
index 835056dd4..cbbb42023 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,49 +5,46 @@ linux-2.6 (2.6.13-1) UNRELEASED; urgency=low
 
  -- Simon Horman <horms@debian.org>  Tue, 30 Aug 2005 19:27:52 +0900
 
-linux-2.6 (2.6.12-6) UNRELEASED; urgency=low
+linux-2.6 (2.6.12-7) UNRELEASED; urgency=low
+
+  [ Simon Horman ]
+  * [SECURITY] THe seq_file memory leak fix included in 2.6.12-6
+    as part of upstream's 2.6.12.6 patchset is now CAN-2005-2800.
+
+ -- Simon Horman <horms@debian.org>  Fri,  9 Sep 2005 11:38:06 +0900
+
+linux-2.6 (2.6.12-6) unstable; urgency=high
 
   [ Andres Salomon, Bastian Blank ]
   * Change ATM and Classical-IP-over-ATM to be modular, instead of being
-    statically included.
-    (closes: #323143)
+    statically included. (closes: #323143)
 
   [ Sven Luther ]
-  * [powerpc]
-    - Added pmac-sound sanity check patch.
-    - Added preliminary apus patch, not applied though.
+  * [powerpc] powerpc-pmac-sound-check.patch: Added pmac-sound sanity check.
+  * [powerpc] powerpc-apus.patch:
+    Added preliminary apus patch to package, not applied to kernel tree yet.
 
   [ Simon Horman ]
   * Unset CC_OPTIMIZE_FOR_SIZE in i386 config,
     it breaks iproute's (and other netlink users) ability
     to set routes. (closes: #322723)
-
-  * net-sockglue-cap.patch
-    [Security] Restrict socket policy loading to CAP_NET_ADMIN.
-    See CAN-2005-2555.
-
-  * zlib deflateBound() patch added as part of the 2.6.12.5 patch in
-    2.6.12-3 now has a CAN number.
-    See CAN-2005-2457
-
   * Added 2.6.12.6
-    - [Security] Restrict socket policy loading to CAP_NET_ADMIN.
-      See CAN-2005-2555.
-    - [Maybe-Security: Can remote traffic trigger this]
-      Fix DST leak in icmp_push_reply()
-    - [Maybe-Security: Seems like a local DoS]
-      NPTL signal delivery deadlock fix
+    - [SECURITY: CAN-2005-2555] Restrict socket policy loading to
+      CAP_NET_ADMIN.
+    - [SECURITY] Fix DST leak in icmp_push_reply().  Possible remote
+      DoS?
+    - [SECURITY] NPTL signal delivery deadlock fix; possible local
+      DoS.
     - fix gl_skb/skb type error in genelink driver in usbnet
-    - [Security] fix a memory leak in devices seq_file implementation
-      See CAN-2005-2800
-    - [Maybe-Security: Seems like a local DoS]
-      Fix SKB leak in ip6_input_finish()
+    - [SECURITY] fix a memory leak in devices seq_file implementation;
+      local DoS.
+    - [SECURITY] Fix SKB leak in ip6_input_finish(); local DoS.
 
-  * amd64-insert_vm_struct-leak.patch
-    [Security] TASK_SIZE fixes for compatibility mode processes
-    See CAN-2005-2617
+  [ Andres Salomon ]
+  * [hppa] enable discontiguous memory support for 32bit hppa images, so
+    they build.
 
- -- Simon Horman <horms@debian.org>  Fri,  9 Sep 2005 11:30:06 +0900
+ -- Andres Salomon <dilinger@debian.org>  Tue, 06 Sep 2005 10:14:35 -0400
 
 linux-2.6 (2.6.12-5) unstable; urgency=low