diff --git a/debian/changelog b/debian/changelog
index dc0015d69..e9aac448b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+linux-2.6 (2.6.12-3) UNRELEASED; urgency=low
+
+  [ Simon Horman ]
+  * Added reference to old kernel-* package names to make
+    transition a little more obvious to end uers.
+    A Dan Jacobson special Closes: #321167
+
+ -- Simon Horman <horms@debian.org>  Tue,  9 Aug 2005 11:00:51 +0900
+
 linux-2.6 (2.6.12-2) unstable; urgency=low
 
   * The Kernel Team offers its condolences to the family of Jens Schmalzig
diff --git a/debian/templates/control.headers.in b/debian/templates/control.headers.in
index a9546dd23..97c9d59c7 100644
--- a/debian/templates/control.headers.in
+++ b/debian/templates/control.headers.in
@@ -11,3 +11,6 @@ Description: Architecture-specific header files for Linux kernel @version@ on @c
  installed into /usr/src/linux-headers-@subarch@@version@-@abiname@-@flavour@, and can
  be used for building modules that load into the kernel provided by the
  linux-image-@subarch@@version@-@abiname@-@flavour@ package.
+ .
+ This packages is produced using an updated kernel packaging system
+ and replaces older kernel-headers packages
diff --git a/debian/templates/control.image.in b/debian/templates/control.image.in
index 01910707e..01b96a13c 100644
--- a/debian/templates/control.image.in
+++ b/debian/templates/control.image.in
@@ -9,3 +9,6 @@ Suggests: linux-doc-@version@ | linux-source-@version@
 Description: Linux kernel @version@ image on @class@ machines
  This package provides the binary image and pre-built loadable modules for
  Linux kernel @version@ on @longclass@ machines.
+ .
+ This packages is produced using an updated kernel packaging system
+ and replaces older kernel-image packages
diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in
index 6032c1a74..4ffc2aac6 100644
--- a/debian/templates/control.main.in
+++ b/debian/templates/control.main.in
@@ -29,6 +29,9 @@ Description: Linux kernel specific documentation for version @version@
  /usr/share/doc/linux-doc-@version@/Documentation/00-INDEX
  .
  for the detailed description of the contents.
+ .
+ This packages is produced using an updated kernel packaging system
+ and replaces older kernel-doc packages
 
 Package: linux-patch-debian-@version@
 Architecture: all
@@ -42,3 +45,6 @@ Description: Debian patches to version @version@ of the Linux kernel
  patches. Note that these patches do NOT apply against a pristine
  Linux @version@ kernel but only against the kernel tarball
  linux-source-@version@_@version@.orig.tar.gz from the Debian archive.
+ . 
+ This packages is produced using an updated kernel packaging system
+ and replaces older kernel-source packages