8 files changed, 10 insertions, 9 deletions
diff --git a/build/arch-options/alpha b/build/arch-options/alpha
index 3db0323dc..760ec38e5 100644
--- a/build/arch-options/alpha
+++ b/build/arch-options/alpha
@@ -3,7 +3,7 @@
 # It is sourced by the build scripts
 
 archspec="alpha;not-i386;not-s390;not-m68k;not-powerpc"
-kernelversion="2.6.15"
+kernelversion="2.6.16"
 arch_listname="alpha"
 # These two options should be set if condition 'smp' is set below
 smp_config_section="General setup"
diff --git a/build/arch-options/hppa b/build/arch-options/hppa
index 7812d5a56..d5d9d6c04 100644
--- a/build/arch-options/hppa
+++ b/build/arch-options/hppa
@@ -3,7 +3,7 @@
 # It is sourced by the build scripts
 
 archspec="hppa;not-i386;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.6.15"
+kernelversion="2.6.16"
 arch_listname="hppa"
 # These two options should be set if condition 'smp' is set below
 smp_config_section="Processor type and features"
diff --git a/build/arch-options/i386 b/build/arch-options/i386
index 5d69b57b0..f38051c6d 100644
--- a/build/arch-options/i386
+++ b/build/arch-options/i386
@@ -3,7 +3,7 @@
 # It is sourced by the build scripts
 
 archspec="i386;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.6.15"
+kernelversion="2.6.16"
 arch_listname="boot"
 # These two options should be set if condition 'smp' is set below
 smp_config_section="Processor type and features"
diff --git a/build/arch-options/ia64 b/build/arch-options/ia64
index 3bf87ccab..6c89cab3c 100644
--- a/build/arch-options/ia64
+++ b/build/arch-options/ia64
@@ -3,7 +3,7 @@
 # It is sourced by the build scripts
 
 archspec="ia64;not-i386;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.6.15"
+kernelversion="2.6.16"
 arch_listname="ia64"
 # These two options should be set if condition 'smp' is set below
 smp_config_section="General setup"
diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc
index ae72d907a..478d7ba05 100644
--- a/build/arch-options/powerpc
+++ b/build/arch-options/powerpc
@@ -3,7 +3,7 @@
 # It is sourced by the build scripts
 
 archspec="powerpc;not-s390;not-m68k;not-i386;not-alpha"
-kernelversion="2.6.15"
+kernelversion="2.6.16"
 arch_listname="powerpc"
 # These two options should be set if condition 'smp' is set below
 smp_config_section="Platform support"
diff --git a/build/arch-options/s390 b/build/arch-options/s390
index 94e5be1d9..7b140dfca 100644
--- a/build/arch-options/s390
+++ b/build/arch-options/s390
@@ -3,7 +3,7 @@
 # It is sourced by the build scripts
 
 archspec="s390;not-powerpc;not-m68k;not-i386;not-alpha"
-kernelversion="2.4.27"
+kernelversion="2.6.16"
 arch_listname="s390"
 # These two options should be set if condition 'smp' is set below
 smp_config_section="Processor type and features"
@@ -11,7 +11,7 @@ smp_config_option="Symmetric multi-processing support"
 
 # Options below are assembled into one variable 'condition'
 # in the build scripts
-kernelpackage="classic-kpkg"
+kernelpackage="common-kpkg"
 fdisk="fdasd.txt;dasdfmt.txt"
 network=""
 boot=""
diff --git a/build/arch-options/sparc b/build/arch-options/sparc
index fe0f4395d..18313677c 100644
--- a/build/arch-options/sparc
+++ b/build/arch-options/sparc
@@ -3,7 +3,7 @@
 # It is sourced by the build scripts
 
 archspec="sparc;not-i386;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.6.15"
+kernelversion="2.6.16"
 arch_listname="sparc"
 # These two options should be set if condition 'smp' is set below
 smp_config_section="General setup"
diff --git a/debian/changelog b/debian/changelog
index b888b79a6..1da2027ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,8 +55,9 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low
 
   [ Frans Pop ]
   * Etch has been assigned version 4.0.
+  * Update kernel versions to 2.6.16.
 
- -- Frans Pop <fjp@debian.org>  Sun, 16 Jul 2006 15:08:31 +0200
+ -- Frans Pop <fjp@debian.org>  Sun, 16 Jul 2006 15:45:37 +0200
 
 installation-guide (20060427) unstable; urgency=low