diff --git a/debian/templates/control.headers.featureset.in b/debian/templates/control.headers.featureset.in
index 4ad22dbef..20fe22a0d 100644
--- a/debian/templates/control.headers.featureset.in
+++ b/debian/templates/control.headers.featureset.in
@@ -4,9 +4,9 @@ Priority: optional
 Description: Common header files for Linux @upstreamversion@@abiname@@localversion_headers@
  This package provides the architecture-specific common kernel header files
  for Linux kernel version @upstreamversion@, generally used for building out-of-tree
- kernel modules. To obtain a complete set of headers you also need to install
+ kernel modules.  To obtain a complete set of headers you also need to install
  the linux-headers-@upstreamversion@@abiname@-(flavour) package, matching the
- flavour of the kernel you intend the build for. To obtain such a set for the
+ flavour of the kernel you intend the build for.  To obtain such a set for the
  currently running kernel it is sufficient to run a command
  .
  apt-get install linux-headers-$(uname -r)
diff --git a/debian/templates/control.headers.in b/debian/templates/control.headers.in
index 6d369b49b..50867e986 100644
--- a/debian/templates/control.headers.in
+++ b/debian/templates/control.headers.in
@@ -5,7 +5,7 @@ Depends: linux-headers-@upstreamversion@@abiname@-common@localversion_headers@ (
 Provides: linux-headers, linux-headers-@major@
 Description: Header files for Linux @upstreamversion@@abiname@@localversion@
  This package provides the architecture-specific kernel header files
- for Linux kernel @upstreamversion@ on @longclass@ machines, generally
+ for Linux kernel @upstreamversion@@abiname@@localversion@, generally
  used for building out-of-tree kernel modules.  These files are going to be
  installed into /usr/src/linux-headers-@upstreamversion@@abiname@@localversion@, and can
  be used for building modules that load into the kernel provided by the
diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in
index baac2109d..21e3a8cb3 100644
--- a/debian/templates/control.main.in
+++ b/debian/templates/control.main.in
@@ -25,12 +25,10 @@ Priority: optional
 Provides: linux-doc-@major@
 Description: Linux kernel specific documentation for version @version@
  This package provides the various README files and HTML documentation for
- the Linux kernel version @version@. Plenty of information, including the
+ the Linux kernel version @version@.  Plenty of information, including the
  descriptions of various kernel subsystems, filesystems, driver-specific
- notes and the like. Consult the file
- .
+ notes and the like.  Consult the file
  /usr/share/doc/linux-doc-@version@/Documentation/00-INDEX
- .
  for the detailed description of the contents.
 
 Package: linux-manual-@version@
@@ -42,12 +40,12 @@ Conflicts: linux-manual, kernel-manual-@major@
 Replaces: linux-manual, kernel-manual-@major@
 Description: Linux kernel API manual pages for version @version@
  This package provides the Kernel Hacker's Guide in the form of
- manual pages, describing the kernel API functions. They
+ manual pages, describing the kernel API functions.  They
  are installed into section 9 of the manual.
  .
  As the files containing manual pages for different kernel versions
  are installed in the same location, only one linux-manual package
- may be installed at a time. The linux-doc package containing the
+ may be installed at a time.  The linux-doc package containing the
  documentation in other formats is free from such restriction.
 
 Package: linux-patch-debian-@version@
@@ -59,6 +57,6 @@ Suggests: linux-source-@version@
 Description: Debian patches to version @version@ of the Linux kernel
  This package includes the patches used to produce the prepackaged
  linux-source-@version@ package, as well as architecture-specific
- patches. Note that these patches do NOT apply against a pristine
+ patches.  Note that these patches do NOT apply against a pristine
  Linux @version@ kernel but only against the kernel tarball
  linux-@major@_@source_upstream@.orig.tar.gz from the Debian archive.
diff --git a/debian/templates/control.tree.in b/debian/templates/control.tree.in
index 728812e12..b2cf9940a 100644
--- a/debian/templates/control.tree.in
+++ b/debian/templates/control.tree.in
@@ -6,17 +6,17 @@ Description: Linux kernel source tree for building Debian kernel images
  This meta package is used as a build dependency of Debian
  linux-image packages to prevent a version discrepancy between
  the linux-image and corresponding linux-sources packages in the
- fast-moving unstable archive. The package's dependency relations
+ fast-moving unstable archive.  The package's dependency relations
  are structured so that a linux-image package's build
  dependencies can always be satisfied, even if the linux-source
  package that had been used to compile the image has been
  superseeded by a newer Debian revision since the last build.
  .
  The package provides a list of virtual packages, corresponding to
- Debian revisions of a linux-source package. The Debian
+ Debian revisions of a linux-source package.  The Debian
  linux-patch contains the information needed to roll back the
  current linux-source to any of the revisions identified by the
- provided virtual packages. Therefore, the linux-tree package
+ provided virtual packages.  Therefore, the linux-tree package
  ensures the availability of the Linux kernel source tree corresponding
  to each of the virtual packages listed.
  .