diff --git a/debian/arch/hppa/defines b/debian/arch/hppa/defines
index 50c2981ab..b7d44df3d 100644
--- a/debian/arch/hppa/defines
+++ b/debian/arch/hppa/defines
@@ -23,6 +23,6 @@ class: 64-bit PA-RISC
 class: multi-processor 64-bit PA-RISC
 
 [relations]
-gcc: gcc (>= 4:4.0), binutils-hppa64, gcc-4.0-hppa64
+gcc-4.0: gcc-4.0, binutils-hppa64, gcc-4.0-hppa64
 gcc-4.0: gcc-4.0, binutils-hppa64, gcc-4.0-hppa64
 
diff --git a/debian/arch/powerpc/defines b/debian/arch/powerpc/defines
index e409c1b03..4f0fb2134 100644
--- a/debian/arch/powerpc/defines
+++ b/debian/arch/powerpc/defines
@@ -4,6 +4,7 @@ flavours:
  powerpc-smp
  powerpc-miboot
  powerpc64
+ prep
 kernel-header-dirs: powerpc ppc m68k
 kernel-arch: powerpc
 kpkg-subarch: ppc
@@ -17,6 +18,7 @@ kernel-arch: ppc
 [prep]
 depends: mkvmlinuz (>= 21)
 kernel-arch: ppc
+kpkg-subarch: prep
 
 [powerpc]
 depends: mkvmlinuz (>= 21)
diff --git a/debian/changelog b/debian/changelog
index fc7015214..5f910812f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,7 +49,7 @@ linux-2.6 (2.6.16+2.6.17-rc3-0experimental.1) experimental; urgency=low
 
  -- Frederik Schüler <fs@debian.org>  Sun,  7 May 2006 17:06:29 +0200
 
-linux-2.6 (2.6.16-15) UNRELEASED; urgency=low
+linux-2.6.16 (2.6.16-15) unstable; urgency=low
 
   [ maximilian attems ]
   * Add stable release 2.6.16.18:
@@ -69,6 +69,11 @@ linux-2.6 (2.6.16-15) UNRELEASED; urgency=low
     - sbp2: fix check of return value of hpsb_allocate_and_register_addrspace
     - x86_64: x86_64 add crashdump trigger points
     - ipw2200: Filter unsupported channels out in ad-hoc mode
+  * Add stable release 2.6.16.21:
+    - check_process_timers: fix possible lockup
+    - run_posix_cpu_timers: remove a bogus BUG_ON() (CVE-2006-2445)
+    - xt_sctp: fix endless loop caused by 0 chunk length (CVE-2006-3085)
+    - powerpc: Fix machine check problem on 32-bit kernels (CVE-2006-2448)
 
   [ Christian T. Steigies ]
   * [m68k] Add mac via patch from Finn Thain.
@@ -99,8 +104,19 @@ linux-2.6 (2.6.16-15) UNRELEASED; urgency=low
 
   [ Bastian Blank ]
   * Update vserver patch to 2.0.2-rc21.
+  * Bump build-dependency on kernel-package to 10.049.
 
- -- maximilian attems <maks@sternwelten.at>  Mon,  5 Jun 2006 20:22:12 +0200
+  [ Jurij Smakov ]
+  * Add dcache-memory-corruption.patch to fix the mremap(), occasionally
+    triggered on sparc in the form of dpkg database corruption. Affects
+    sparc64, mips and generic includes. Thanks to David Miller, original
+    patch is included in 2.6.17.
+    Ref: http://marc.theaimsgroup.com/?l=linux-sparc&m=114920963824047&w=2
+  * Add sparc32-iotlb.patch to fix the DMA errors encountered with latest
+    kernels on sparc32, in particularly HyperSparcs. Thanks to Bob Breuer.
+    Ref: http://marc.theaimsgroup.com/?l=linux-sparc&m=115077649707675&w=2
+
+ -- Bastian Blank <waldi@debian.org>  Wed, 21 Jun 2006 14:09:11 +0200
 
 linux-2.6 (2.6.16-14) unstable; urgency=low
 
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 2d3bc194b..d8d12618d 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -4,5 +4,5 @@ Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: Andres Salomon <dilinger@debian.org>, Bastian Blank <waldi@debian.org>, Simon Horman <horms@debian.org>, Sven Luther <luther@debian.org>, Jonas Smedegaard <dr@jones.dk>, Norbert Tretkowski <nobse@debian.org>, Frederik Schüler <fs@debian.org>
 Standards-Version: 3.6.1.0
-Build-Depends: debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 10.047), ocaml-interp, python, python2.4-minimal
+Build-Depends: debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 10.049), ocaml-interp, python, python2.4-minimal
 Build-Depends-Indep: docbook-utils, gs, transfig, xmlto