diff -Nru linux-latest-46/debian/bin/gencontrol.py linux-latest-46+rpi1/debian/bin/gencontrol.py
--- linux-latest-46/debian/bin/gencontrol.py	2012-01-30 04:27:08.000000000 +0000
+++ linux-latest-46+rpi1/debian/bin/gencontrol.py	2013-08-02 19:50:55.000000000 +0000
@@ -26,6 +26,7 @@
 
         changelog_version = Changelog()[0].version
         self.package_version = u'%s+%s' % (self.version.linux_version, changelog_version.complete)
+        self.rpf_version = u'%s+%s' % ('3.6', changelog_version.complete)
 
     def do_main_setup(self, vars, makeflags, extra):
         makeflags['GENCONTROL_ARGS'] = '-v%s' % self.package_version
@@ -129,7 +130,7 @@
                 if i.has_key(u'X-Version-Overwrite-Epoch'):
                     version = u'-v1:%s' % self.package_version
                 else:
-                    version = u'-v%s' % self.package_version
+                    version = u'-v%s' % self.rpf_version
                 cmds += self.get_link_commands(i, ['config', 'postinst', 'templates'])
                 cmds.append("$(MAKE) -f debian/rules.real install-dummy ARCH='%s' DH_OPTIONS='-p%s' GENCONTROL_ARGS='%s'" % (arch, i['Package'], version))
             makefile.add('binary-arch_%s' % arch, [u'binary-arch_%s_extra' % arch])
diff -Nru linux-latest-46/debian/changelog linux-latest-46+rpi1/debian/changelog
--- linux-latest-46/debian/changelog	2012-10-07 18:51:51.000000000 +0000
+++ linux-latest-46+rpi1/debian/changelog	2013-08-02 19:56:03.000000000 +0000
@@ -1,3 +1,17 @@
+linux-latest (46+rpi1) wheezy-staging; urgency=low
+
+  * Regenerate control files to build for rpi flavour rather than
+    omap and mx5 flavours
+  * Remove "2.6" legacy packages for vexpress and omap
+  * add -rpi-rpfv packages for kernel packages based on the raspberry pi
+    foundations reccomended kernel version (currently 3.6).
+  * Hack the control generation script so the above packages are versioned
+    appropriately (note: this will break versioning for other "extra packages",
+    we don't have any of those in raspbian but building this source package
+    on other architectures may produce unexpected results and is not reccomended
+
+ -- Peter Micheal Green  <plugwash@raspbian.org>  Fri, 02 Aug 2013 19:07:53 +0000
+
 linux-latest (46) unstable; urgency=low
 
   * Set Priority: extra, as currently overridden in the archive
diff -Nru linux-latest-46/debian/control linux-latest-46+rpi1/debian/control
--- linux-latest-46/debian/control	2012-10-07 18:52:35.000000000 +0000
+++ linux-latest-46+rpi1/debian/control	2013-08-02 19:56:21.000000000 +0000
@@ -85,7 +85,7 @@
 Depends: linux-image-3.2.0-4-amd64, ${misc:Depends}
 Description: Linux for 64-bit PCs (meta-package)
  This package depends on the latest Linux kernel and modules for use on PCs
- with AMD64 or Intel 64 processors.
+ with AMD64, Intel 64 or VIA Nano processors.
  .
  This kernel also runs on a Xen hypervisor.  It supports both privileged
  (dom0) and unprivileged (domU) operation.
@@ -112,7 +112,7 @@
 Depends: linux-image-3.2.0-4-rt-amd64, ${misc:Depends}
 Description: Linux for 64-bit PCs (meta-package), PREEMPT_RT
  This package depends on the latest Linux kernel and modules for use on PCs
- with AMD64 or Intel 64 processors.
+ with AMD64, Intel 64 or VIA Nano processors.
  .
  This kernel includes the PREEMPT_RT realtime patch set.
 
@@ -220,53 +220,21 @@
  This package depends on the architecture-specific header files for the
  latest Linux kernel versatile configuration.
 
-Package: linux-image-mx5
+Package: linux-image-rpi
 Architecture: armhf
-Provides: linux-latest-modules-3.2.0-4-mx5
-Depends: linux-image-3.2.0-4-mx5, ${misc:Depends}
-Description: Linux for Freescale i.MX51 (meta-package)
+Provides: linux-latest-modules-3.2.0-4-rpi
+Depends: linux-image-3.2.0-4-rpi, ${misc:Depends}
+Description: Linux for RaspberryPI (meta-package)
  This package depends on the latest Linux kernel and modules for use on
- Support for Freescale i.MX51 family of processors.
+ Raspberry PI.
 
-Package: linux-headers-mx5
+Package: linux-headers-rpi
 Architecture: armhf
 Provides: linux-headers
-Depends: linux-headers-3.2.0-4-mx5, ${misc:Depends}
-Description: Header files for Linux mx5 configuration (meta-package)
+Depends: linux-headers-3.2.0-4-rpi, ${misc:Depends}
+Description: Header files for Linux rpi configuration (meta-package)
  This package depends on the architecture-specific header files for the
- latest Linux kernel mx5 configuration.
-
-Package: linux-image-omap
-Architecture: armhf
-Provides: linux-latest-modules-3.2.0-4-omap
-Depends: linux-image-3.2.0-4-omap, ${misc:Depends}
-Description: Linux for TI OMAP3+ (meta-package)
- This package depends on the latest Linux kernel and modules for use on
- Texas Instruments OMAP3 or OMAP4 based systems.
-
-Package: linux-headers-omap
-Architecture: armhf
-Provides: linux-headers
-Depends: linux-headers-3.2.0-4-omap, ${misc:Depends}
-Description: Header files for Linux omap configuration (meta-package)
- This package depends on the architecture-specific header files for the
- latest Linux kernel omap configuration.
-
-Package: linux-image-vexpress
-Architecture: armhf
-Provides: linux-latest-modules-3.2.0-4-vexpress
-Depends: linux-image-3.2.0-4-vexpress, ${misc:Depends}
-Description: Linux for ARM Ltd. Versatile Express (meta-package)
- This package depends on the latest Linux kernel and modules for use on ARM
- Ltd.  Versatile Express family of processors.
-
-Package: linux-headers-vexpress
-Architecture: armhf
-Provides: linux-headers
-Depends: linux-headers-3.2.0-4-vexpress, ${misc:Depends}
-Description: Header files for Linux vexpress configuration (meta-package)
- This package depends on the architecture-specific header files for the
- latest Linux kernel vexpress configuration.
+ latest Linux kernel rpi configuration.
 
 Package: linux-image-parisc
 Architecture: hppa
@@ -965,13 +933,6 @@
 Description: Header files for Linux mvme16x configuration (dummy package)
  This is a dummy transitional package.  It can be safely removed.
 
-Package: linux-headers-2.6-mx5
-Architecture: armhf
-Section: oldlibs
-Depends: linux-headers-mx5, ${misc:Depends}
-Description: Header files for Linux mx5 configuration (dummy package)
- This is a dummy transitional package.  It can be safely removed.
-
 Package: linux-headers-2.6-octeon
 Architecture: mips
 Section: oldlibs
@@ -979,13 +940,6 @@
 Description: Header files for Linux octeon configuration (dummy package)
  This is a dummy transitional package.  It can be safely removed.
 
-Package: linux-headers-2.6-omap
-Architecture: armhf
-Section: oldlibs
-Depends: linux-headers-omap, ${misc:Depends}
-Description: Header files for Linux omap configuration (dummy package)
- This is a dummy transitional package.  It can be safely removed.
-
 Package: linux-headers-2.6-orion5x
 Architecture: armel
 Section: oldlibs
@@ -1273,13 +1227,6 @@
 Description: Linux for Motorola MVME162/6/7, MVME172/7 (dummy package)
  This is a dummy transitional package.  It can be safely removed.
 
-Package: linux-image-2.6-mx5
-Architecture: armhf
-Section: oldlibs
-Depends: linux-image-mx5, ${misc:Depends}
-Description: Linux for Freescale MXC/iMX-based (dummy package)
- This is a dummy transitional package.  It can be safely removed.
-
 Package: linux-image-2.6-octeon
 Architecture: mips
 Section: oldlibs
@@ -1287,13 +1234,6 @@
 Description: Linux for Octeon (dummy package)
  This is a dummy transitional package.  It can be safely removed.
 
-Package: linux-image-2.6-omap
-Architecture: armhf
-Section: oldlibs
-Depends: linux-image-omap, ${misc:Depends}
-Description: Linux for TI OMAP3+ (dummy package)
- This is a dummy transitional package.  It can be safely removed.
-
 Package: linux-image-2.6-orion5x
 Architecture: armel
 Section: oldlibs
@@ -1476,3 +1416,18 @@
 Description: Xen system with Linux for 64-bit PCs (dummy package)
  This is a dummy transitional package.  It can be safely removed.
 
+Package: linux-image-rpi-rpfv
+Architecture: armhf
+Depends: linux-image-3.6-trunk-rpi
+Description: 
+ This metapackage will pull in the raspbian kernel based on the version
+ currently reccomended by the raspberry pi foundation (currently 3.6).
+
+Package: linux-headers-rpi-rpfv
+Architecture: armhf
+Depends: linux-headers-3.6-trunk-rpi
+Description: 
+ This metapackage will pull in the headers for the raspbian kernel based on
+ the version of linux currently reccomended by the raspberry pi foundation
+ (currently 3.6).
+
diff -Nru linux-latest-46/debian/control.md5sum linux-latest-46+rpi1/debian/control.md5sum
--- linux-latest-46/debian/control.md5sum	2012-10-07 18:52:35.000000000 +0000
+++ linux-latest-46+rpi1/debian/control.md5sum	2013-08-02 19:56:21.000000000 +0000
@@ -1,7 +1,7 @@
-8344793b1b54e167e9cc8cd602604995  debian/bin/gencontrol.py
-6d2ca8facd19568dddc34fb796e9a6a5  debian/changelog
+2ca2bd7b306e9662e285769ef47e0247  debian/bin/gencontrol.py
+2cc75856271ceaf6b1b1f98e29b13aff  debian/changelog
 4d68743d40f39f9db4b5865676c513ee  debian/templates/control.doc.latest.in
-ab9427b556f4f6b12a9c73e10b3babeb  debian/templates/control.extra.in
+ae9d40ac4f7ce168fa13bba2ae09bc25  debian/templates/control.extra.in
 0a0369e1588b84a9dc21da6ee74a6bf6  debian/templates/control.headers.latest.in
 c78545990739b7f1546987497342b75d  debian/templates/control.image.latest.type-standalone.in
 6be9ccf82a1c4a2dc0bee8ebe0c69b74  debian/templates/control.source.in
diff -Nru linux-latest-46/debian/linux-headers-2.6-omap/DEBIAN/control linux-latest-46+rpi1/debian/linux-headers-2.6-omap/DEBIAN/control
--- linux-latest-46/debian/linux-headers-2.6-omap/DEBIAN/control	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-46+rpi1/debian/linux-headers-2.6-omap/DEBIAN/control	2013-08-02 19:31:28.000000000 +0000
@@ -0,0 +1,11 @@
+Package: linux-headers-2.6-omap
+Source: linux-latest (46+nmu1)
+Version: 3.2+46+nmu1
+Architecture: armhf
+Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
+Installed-Size: 28
+Depends: linux-headers-omap
+Section: oldlibs
+Priority: extra
+Description: Header files for Linux omap configuration (dummy package)
+ This is a dummy transitional package.  It can be safely removed.
diff -Nru linux-latest-46/debian/linux-headers-2.6-omap/DEBIAN/md5sums linux-latest-46+rpi1/debian/linux-headers-2.6-omap/DEBIAN/md5sums
--- linux-latest-46/debian/linux-headers-2.6-omap/DEBIAN/md5sums	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-46+rpi1/debian/linux-headers-2.6-omap/DEBIAN/md5sums	2013-08-02 19:31:28.000000000 +0000
@@ -0,0 +1,2 @@
+77512805c9261d8c0c0eabee025a3dbf  usr/share/doc/linux-headers-2.6-omap/changelog.gz
+5e5300a90625dbe51d8f6d2d1179a92c  usr/share/doc/linux-headers-2.6-omap/copyright
Binary files /tmp/L8bM2DvRDX/linux-latest-46/debian/linux-headers-2.6-omap/usr/share/doc/linux-headers-2.6-omap/changelog.gz and /tmp/7i8NLKNYBW/linux-latest-46+rpi1/debian/linux-headers-2.6-omap/usr/share/doc/linux-headers-2.6-omap/changelog.gz differ
diff -Nru linux-latest-46/debian/linux-headers-2.6-omap/usr/share/doc/linux-headers-2.6-omap/copyright linux-latest-46+rpi1/debian/linux-headers-2.6-omap/usr/share/doc/linux-headers-2.6-omap/copyright
--- linux-latest-46/debian/linux-headers-2.6-omap/usr/share/doc/linux-headers-2.6-omap/copyright	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-46+rpi1/debian/linux-headers-2.6-omap/usr/share/doc/linux-headers-2.6-omap/copyright	2011-12-16 04:48:11.000000000 +0000
@@ -0,0 +1,22 @@
+Copyright:
+
+    Copyright (C) 2006-2009 Bastian Blank <waldi@debian.org>
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
diff -Nru linux-latest-46/debian/linux-headers-2.6-omap.substvars linux-latest-46+rpi1/debian/linux-headers-2.6-omap.substvars
--- linux-latest-46/debian/linux-headers-2.6-omap.substvars	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-46+rpi1/debian/linux-headers-2.6-omap.substvars	2013-08-02 19:31:26.000000000 +0000
@@ -0,0 +1 @@
+misc:Depends=
diff -Nru linux-latest-46/debian/linux-image-2.6-mx5/DEBIAN/control linux-latest-46+rpi1/debian/linux-image-2.6-mx5/DEBIAN/control
--- linux-latest-46/debian/linux-image-2.6-mx5/DEBIAN/control	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-46+rpi1/debian/linux-image-2.6-mx5/DEBIAN/control	2013-08-02 19:31:39.000000000 +0000
@@ -0,0 +1,11 @@
+Package: linux-image-2.6-mx5
+Source: linux-latest (46+nmu1)
+Version: 3.2+46+nmu1
+Architecture: armhf
+Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
+Installed-Size: 28
+Depends: linux-image-mx5
+Section: oldlibs
+Priority: extra
+Description: Linux for Freescale MXC/iMX-based (dummy package)
+ This is a dummy transitional package.  It can be safely removed.
diff -Nru linux-latest-46/debian/linux-image-2.6-mx5/DEBIAN/md5sums linux-latest-46+rpi1/debian/linux-image-2.6-mx5/DEBIAN/md5sums
--- linux-latest-46/debian/linux-image-2.6-mx5/DEBIAN/md5sums	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-46+rpi1/debian/linux-image-2.6-mx5/DEBIAN/md5sums	2013-08-02 19:31:39.000000000 +0000
@@ -0,0 +1,2 @@
+77512805c9261d8c0c0eabee025a3dbf  usr/share/doc/linux-image-2.6-mx5/changelog.gz
+5e5300a90625dbe51d8f6d2d1179a92c  usr/share/doc/linux-image-2.6-mx5/copyright
Binary files /tmp/L8bM2DvRDX/linux-latest-46/debian/linux-image-2.6-mx5/usr/share/doc/linux-image-2.6-mx5/changelog.gz and /tmp/7i8NLKNYBW/linux-latest-46+rpi1/debian/linux-image-2.6-mx5/usr/share/doc/linux-image-2.6-mx5/changelog.gz differ
diff -Nru linux-latest-46/debian/linux-image-2.6-mx5/usr/share/doc/linux-image-2.6-mx5/copyright linux-latest-46+rpi1/debian/linux-image-2.6-mx5/usr/share/doc/linux-image-2.6-mx5/copyright
--- linux-latest-46/debian/linux-image-2.6-mx5/usr/share/doc/linux-image-2.6-mx5/copyright	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-46+rpi1/debian/linux-image-2.6-mx5/usr/share/doc/linux-image-2.6-mx5/copyright	2011-12-16 04:48:11.000000000 +0000
@@ -0,0 +1,22 @@
+Copyright:
+
+    Copyright (C) 2006-2009 Bastian Blank <waldi@debian.org>
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
diff -Nru linux-latest-46/debian/linux-image-2.6-mx5.substvars linux-latest-46+rpi1/debian/linux-image-2.6-mx5.substvars
--- linux-latest-46/debian/linux-image-2.6-mx5.substvars	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-46+rpi1/debian/linux-image-2.6-mx5.substvars	2013-08-02 19:31:36.000000000 +0000
@@ -0,0 +1 @@
+misc:Depends=
diff -Nru linux-latest-46/debian/linux-image-2.6-omap/DEBIAN/control linux-latest-46+rpi1/debian/linux-image-2.6-omap/DEBIAN/control
--- linux-latest-46/debian/linux-image-2.6-omap/DEBIAN/control	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-46+rpi1/debian/linux-image-2.6-omap/DEBIAN/control	2013-08-02 19:31:50.000000000 +0000
@@ -0,0 +1,11 @@
+Package: linux-image-2.6-omap
+Source: linux-latest (46+nmu1)
+Version: 3.2+46+nmu1
+Architecture: armhf
+Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
+Installed-Size: 28
+Depends: linux-image-omap
+Section: oldlibs
+Priority: extra
+Description: Linux for TI OMAP3+ (dummy package)
+ This is a dummy transitional package.  It can be safely removed.
diff -Nru linux-latest-46/debian/linux-image-2.6-omap/DEBIAN/md5sums linux-latest-46+rpi1/debian/linux-image-2.6-omap/DEBIAN/md5sums
--- linux-latest-46/debian/linux-image-2.6-omap/DEBIAN/md5sums	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-46+rpi1/debian/linux-image-2.6-omap/DEBIAN/md5sums	2013-08-02 19:31:50.000000000 +0000
@@ -0,0 +1,2 @@
+77512805c9261d8c0c0eabee025a3dbf  usr/share/doc/linux-image-2.6-omap/changelog.gz
+5e5300a90625dbe51d8f6d2d1179a92c  usr/share/doc/linux-image-2.6-omap/copyright
Binary files /tmp/L8bM2DvRDX/linux-latest-46/debian/linux-image-2.6-omap/usr/share/doc/linux-image-2.6-omap/changelog.gz and /tmp/7i8NLKNYBW/linux-latest-46+rpi1/debian/linux-image-2.6-omap/usr/share/doc/linux-image-2.6-omap/changelog.gz differ
diff -Nru linux-latest-46/debian/linux-image-2.6-omap/usr/share/doc/linux-image-2.6-omap/copyright linux-latest-46+rpi1/debian/linux-image-2.6-omap/usr/share/doc/linux-image-2.6-omap/copyright
--- linux-latest-46/debian/linux-image-2.6-omap/usr/share/doc/linux-image-2.6-omap/copyright	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-46+rpi1/debian/linux-image-2.6-omap/usr/share/doc/linux-image-2.6-omap/copyright	2011-12-16 04:48:11.000000000 +0000
@@ -0,0 +1,22 @@
+Copyright:
+
+    Copyright (C) 2006-2009 Bastian Blank <waldi@debian.org>
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
diff -Nru linux-latest-46/debian/linux-image-2.6-omap.substvars linux-latest-46+rpi1/debian/linux-image-2.6-omap.substvars
--- linux-latest-46/debian/linux-image-2.6-omap.substvars	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-46+rpi1/debian/linux-image-2.6-omap.substvars	2013-08-02 19:31:48.000000000 +0000
@@ -0,0 +1 @@
+misc:Depends=
diff -Nru linux-latest-46/debian/linux-image-rpi.bug-presubj linux-latest-46+rpi1/debian/linux-image-rpi.bug-presubj
--- linux-latest-46/debian/linux-image-rpi.bug-presubj	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-46+rpi1/debian/linux-image-rpi.bug-presubj	2013-08-02 19:56:20.000000000 +0000
@@ -0,0 +1,5 @@
+You are about to report a bug in a Linux kernel meta package.
+This is probably not what you intended to do.
+
+If you want to report a bug in the Linux kernel or modules, you should use
+the package name linux-image-3.2.0-4-rpi instead.
diff -Nru linux-latest-46/debian/rules.gen linux-latest-46+rpi1/debian/rules.gen
--- linux-latest-46/debian/rules.gen	2012-10-07 18:52:35.000000000 +0000
+++ linux-latest-46+rpi1/debian/rules.gen	2013-08-02 19:56:21.000000000 +0000
@@ -2,371 +2,361 @@
 binary-arch: binary-arch_alpha binary-arch_amd64 binary-arch_armel binary-arch_armhf binary-arch_hppa binary-arch_i386 binary-arch_ia64 binary-arch_m68k binary-arch_mips binary-arch_mipsel binary-arch_powerpc binary-arch_ppc64 binary-arch_s390 binary-arch_s390x binary-arch_sh4 binary-arch_sparc binary-arch_sparc64
 binary-arch_all: binary-arch_all_extra
 binary-arch_all_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='all' DH_OPTIONS='-plinux-doc-2.6' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='all' DH_OPTIONS='-plinux-source-2.6' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='all' DH_OPTIONS='-plinux-tools-2.6' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='all' DH_OPTIONS='-plinux-doc-2.6' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='all' DH_OPTIONS='-plinux-source-2.6' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='all' DH_OPTIONS='-plinux-tools-2.6' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_alpha: binary-arch_alpha_extra binary-arch_alpha_none binary-arch_alpha_real
 binary-arch_alpha_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='alpha' DH_OPTIONS='-plinux-headers-2.6-alpha-generic' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='alpha' DH_OPTIONS='-plinux-headers-2.6-alpha-legacy' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='alpha' DH_OPTIONS='-plinux-headers-2.6-alpha-smp' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='alpha' DH_OPTIONS='-plinux-image-2.6-alpha-generic' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='alpha' DH_OPTIONS='-plinux-image-2.6-alpha-legacy' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='alpha' DH_OPTIONS='-plinux-image-2.6-alpha-smp' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='alpha' DH_OPTIONS='-plinux-headers-2.6-alpha-generic' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='alpha' DH_OPTIONS='-plinux-headers-2.6-alpha-legacy' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='alpha' DH_OPTIONS='-plinux-headers-2.6-alpha-smp' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='alpha' DH_OPTIONS='-plinux-image-2.6-alpha-generic' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='alpha' DH_OPTIONS='-plinux-image-2.6-alpha-legacy' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='alpha' DH_OPTIONS='-plinux-image-2.6-alpha-smp' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_alpha_none: binary-arch_alpha_none_alpha-generic binary-arch_alpha_none_alpha-legacy binary-arch_alpha_none_alpha-smp binary-arch_alpha_none_real
 binary-arch_alpha_none_alpha-generic: binary-arch_alpha_none_alpha-generic_real
 binary-arch_alpha_none_alpha-generic_real::
 	ln -sf linux-image.NEWS debian/linux-image-alpha-generic.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-alpha-generic -plinux-headers-alpha-generic' ABINAME='3.2.0-4' ARCH='alpha' FEATURESET='none' FLAVOUR='alpha-generic' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-alpha-generic'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-alpha-generic -plinux-headers-alpha-generic' ABINAME='3.2.0-4' ARCH='alpha' FEATURESET='none' FLAVOUR='alpha-generic' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-alpha-generic'
 binary-arch_alpha_none_alpha-legacy: binary-arch_alpha_none_alpha-legacy_real
 binary-arch_alpha_none_alpha-legacy_real::
 	ln -sf linux-image.NEWS debian/linux-image-alpha-legacy.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-alpha-legacy -plinux-headers-alpha-legacy' ABINAME='3.2.0-4' ARCH='alpha' FEATURESET='none' FLAVOUR='alpha-legacy' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-alpha-legacy'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-alpha-legacy -plinux-headers-alpha-legacy' ABINAME='3.2.0-4' ARCH='alpha' FEATURESET='none' FLAVOUR='alpha-legacy' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-alpha-legacy'
 binary-arch_alpha_none_alpha-smp: binary-arch_alpha_none_alpha-smp_real
 binary-arch_alpha_none_alpha-smp_real::
 	ln -sf linux-image.NEWS debian/linux-image-alpha-smp.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-alpha-smp -plinux-headers-alpha-smp' ABINAME='3.2.0-4' ARCH='alpha' FEATURESET='none' FLAVOUR='alpha-smp' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-alpha-smp'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-alpha-smp -plinux-headers-alpha-smp' ABINAME='3.2.0-4' ARCH='alpha' FEATURESET='none' FLAVOUR='alpha-smp' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-alpha-smp'
 binary-arch_alpha_none_real:
 binary-arch_alpha_real:
 binary-arch_amd64: binary-arch_amd64_extra binary-arch_amd64_none binary-arch_amd64_real binary-arch_amd64_rt
 binary-arch_amd64_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='amd64' DH_OPTIONS='-plinux-headers-2.6-amd64' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='amd64' DH_OPTIONS='-plinux-image-2.6-amd64' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='amd64' DH_OPTIONS='-pxen-linux-system-2.6-xen-amd64' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='amd64' DH_OPTIONS='-plinux-headers-2.6-amd64' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='amd64' DH_OPTIONS='-plinux-image-2.6-amd64' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='amd64' DH_OPTIONS='-pxen-linux-system-2.6-xen-amd64' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_amd64_none: binary-arch_amd64_none_amd64 binary-arch_amd64_none_real
 binary-arch_amd64_none_amd64: binary-arch_amd64_none_amd64_real
 binary-arch_amd64_none_amd64_real::
 	ln -sf linux-image.NEWS debian/linux-image-amd64.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-amd64 -plinux-headers-amd64 -pxen-linux-system-amd64' ABINAME='3.2.0-4' ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-amd64'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-amd64 -plinux-headers-amd64 -pxen-linux-system-amd64' ABINAME='3.2.0-4' ARCH='amd64' FEATURESET='none' FLAVOUR='amd64' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-amd64'
 binary-arch_amd64_none_real:
 binary-arch_amd64_real:
 binary-arch_amd64_rt: binary-arch_amd64_rt_amd64 binary-arch_amd64_rt_real
 binary-arch_amd64_rt_amd64: binary-arch_amd64_rt_amd64_real
 binary-arch_amd64_rt_amd64_real::
 	ln -sf linux-image.NEWS debian/linux-image-rt-amd64.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-rt-amd64 -plinux-headers-rt-amd64' ABINAME='3.2.0-4' ARCH='amd64' FEATURESET='rt' FLAVOUR='amd64' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-rt-amd64'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-rt-amd64 -plinux-headers-rt-amd64' ABINAME='3.2.0-4' ARCH='amd64' FEATURESET='rt' FLAVOUR='amd64' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-rt-amd64'
 binary-arch_amd64_rt_real:
 binary-arch_armel: binary-arch_armel_extra binary-arch_armel_none binary-arch_armel_real
 binary-arch_armel_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-headers-2.6-iop32x' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-headers-2.6-ixp4xx' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-headers-2.6-kirkwood' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-headers-2.6-orion5x' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-headers-2.6-versatile' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-image-2.6-iop32x' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-image-2.6-ixp4xx' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-image-2.6-kirkwood' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-image-2.6-orion5x' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-image-2.6-versatile' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-headers-2.6-iop32x' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-headers-2.6-ixp4xx' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-headers-2.6-kirkwood' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-headers-2.6-orion5x' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-headers-2.6-versatile' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-image-2.6-iop32x' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-image-2.6-ixp4xx' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-image-2.6-kirkwood' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-image-2.6-orion5x' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-image-2.6-versatile' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_armel_none: binary-arch_armel_none_iop32x binary-arch_armel_none_ixp4xx binary-arch_armel_none_kirkwood binary-arch_armel_none_mv78xx0 binary-arch_armel_none_orion5x binary-arch_armel_none_real binary-arch_armel_none_versatile
 binary-arch_armel_none_iop32x: binary-arch_armel_none_iop32x_real
 binary-arch_armel_none_iop32x_real::
 	ln -sf linux-image.NEWS debian/linux-image-iop32x.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-iop32x -plinux-headers-iop32x' ABINAME='3.2.0-4' ARCH='armel' FEATURESET='none' FLAVOUR='iop32x' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-iop32x'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-iop32x -plinux-headers-iop32x' ABINAME='3.2.0-4' ARCH='armel' FEATURESET='none' FLAVOUR='iop32x' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-iop32x'
 binary-arch_armel_none_ixp4xx: binary-arch_armel_none_ixp4xx_real
 binary-arch_armel_none_ixp4xx_real::
 	ln -sf linux-image.NEWS debian/linux-image-ixp4xx.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-ixp4xx -plinux-headers-ixp4xx' ABINAME='3.2.0-4' ARCH='armel' FEATURESET='none' FLAVOUR='ixp4xx' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-ixp4xx'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-ixp4xx -plinux-headers-ixp4xx' ABINAME='3.2.0-4' ARCH='armel' FEATURESET='none' FLAVOUR='ixp4xx' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-ixp4xx'
 binary-arch_armel_none_kirkwood: binary-arch_armel_none_kirkwood_real
 binary-arch_armel_none_kirkwood_real::
 	ln -sf linux-image.NEWS debian/linux-image-kirkwood.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-kirkwood -plinux-headers-kirkwood' ABINAME='3.2.0-4' ARCH='armel' FEATURESET='none' FLAVOUR='kirkwood' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-kirkwood'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-kirkwood -plinux-headers-kirkwood' ABINAME='3.2.0-4' ARCH='armel' FEATURESET='none' FLAVOUR='kirkwood' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-kirkwood'
 binary-arch_armel_none_mv78xx0: binary-arch_armel_none_mv78xx0_real
 binary-arch_armel_none_mv78xx0_real::
 	ln -sf linux-image.NEWS debian/linux-image-mv78xx0.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-mv78xx0 -plinux-headers-mv78xx0' ABINAME='3.2.0-4' ARCH='armel' FEATURESET='none' FLAVOUR='mv78xx0' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-mv78xx0'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-mv78xx0 -plinux-headers-mv78xx0' ABINAME='3.2.0-4' ARCH='armel' FEATURESET='none' FLAVOUR='mv78xx0' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-mv78xx0'
 binary-arch_armel_none_orion5x: binary-arch_armel_none_orion5x_real
 binary-arch_armel_none_orion5x_real::
 	ln -sf linux-image.NEWS debian/linux-image-orion5x.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-orion5x -plinux-headers-orion5x' ABINAME='3.2.0-4' ARCH='armel' FEATURESET='none' FLAVOUR='orion5x' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-orion5x'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-orion5x -plinux-headers-orion5x' ABINAME='3.2.0-4' ARCH='armel' FEATURESET='none' FLAVOUR='orion5x' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-orion5x'
 binary-arch_armel_none_real:
 binary-arch_armel_none_versatile: binary-arch_armel_none_versatile_real
 binary-arch_armel_none_versatile_real::
 	ln -sf linux-image.NEWS debian/linux-image-versatile.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-versatile -plinux-headers-versatile' ABINAME='3.2.0-4' ARCH='armel' FEATURESET='none' FLAVOUR='versatile' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-versatile'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-versatile -plinux-headers-versatile' ABINAME='3.2.0-4' ARCH='armel' FEATURESET='none' FLAVOUR='versatile' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-versatile'
 binary-arch_armel_real:
 binary-arch_armhf: binary-arch_armhf_extra binary-arch_armhf_none binary-arch_armhf_real
 binary-arch_armhf_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='armhf' DH_OPTIONS='-plinux-headers-2.6-mx5' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='armhf' DH_OPTIONS='-plinux-headers-2.6-omap' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='armhf' DH_OPTIONS='-plinux-image-2.6-mx5' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='armhf' DH_OPTIONS='-plinux-image-2.6-omap' GENCONTROL_ARGS='-v3.2+46'
-binary-arch_armhf_none: binary-arch_armhf_none_mx5 binary-arch_armhf_none_omap binary-arch_armhf_none_real binary-arch_armhf_none_vexpress
-binary-arch_armhf_none_mx5: binary-arch_armhf_none_mx5_real
-binary-arch_armhf_none_mx5_real::
-	ln -sf linux-image.NEWS debian/linux-image-mx5.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-mx5 -plinux-headers-mx5' ABINAME='3.2.0-4' ARCH='armhf' FEATURESET='none' FLAVOUR='mx5' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-mx5'
-binary-arch_armhf_none_omap: binary-arch_armhf_none_omap_real
-binary-arch_armhf_none_omap_real::
-	ln -sf linux-image.NEWS debian/linux-image-omap.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-omap -plinux-headers-omap' ABINAME='3.2.0-4' ARCH='armhf' FEATURESET='none' FLAVOUR='omap' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-omap'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='armhf' DH_OPTIONS='-plinux-image-rpi-rpfv' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='armhf' DH_OPTIONS='-plinux-headers-rpi-rpfv' GENCONTROL_ARGS='-v3.6+46+rpi1'
+binary-arch_armhf_none: binary-arch_armhf_none_real binary-arch_armhf_none_rpi
 binary-arch_armhf_none_real:
-binary-arch_armhf_none_vexpress: binary-arch_armhf_none_vexpress_real
-binary-arch_armhf_none_vexpress_real::
-	ln -sf linux-image.NEWS debian/linux-image-vexpress.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-vexpress -plinux-headers-vexpress' ABINAME='3.2.0-4' ARCH='armhf' FEATURESET='none' FLAVOUR='vexpress' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-vexpress'
+binary-arch_armhf_none_rpi: binary-arch_armhf_none_rpi_real
+binary-arch_armhf_none_rpi_real::
+	ln -sf linux-image.NEWS debian/linux-image-rpi.NEWS
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-rpi -plinux-headers-rpi' ABINAME='3.2.0-4' ARCH='armhf' FEATURESET='none' FLAVOUR='rpi' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-rpi'
 binary-arch_armhf_real:
 binary-arch_hppa: binary-arch_hppa_extra binary-arch_hppa_none binary-arch_hppa_real
 binary-arch_hppa_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-headers-2.6-parisc' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-headers-2.6-parisc-smp' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-headers-2.6-parisc64' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-headers-2.6-parisc64-smp' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-image-2.6-parisc' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-image-2.6-parisc-smp' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-image-2.6-parisc64' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-image-2.6-parisc64-smp' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-headers-2.6-parisc' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-headers-2.6-parisc-smp' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-headers-2.6-parisc64' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-headers-2.6-parisc64-smp' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-image-2.6-parisc' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-image-2.6-parisc-smp' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-image-2.6-parisc64' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='hppa' DH_OPTIONS='-plinux-image-2.6-parisc64-smp' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_hppa_none: binary-arch_hppa_none_parisc binary-arch_hppa_none_parisc-smp binary-arch_hppa_none_parisc64 binary-arch_hppa_none_parisc64-smp binary-arch_hppa_none_real
 binary-arch_hppa_none_parisc: binary-arch_hppa_none_parisc_real
 binary-arch_hppa_none_parisc-smp: binary-arch_hppa_none_parisc-smp_real
 binary-arch_hppa_none_parisc-smp_real::
 	ln -sf linux-image.NEWS debian/linux-image-parisc-smp.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-parisc-smp -plinux-headers-parisc-smp' ABINAME='3.2.0-4' ARCH='hppa' FEATURESET='none' FLAVOUR='parisc-smp' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-parisc-smp'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-parisc-smp -plinux-headers-parisc-smp' ABINAME='3.2.0-4' ARCH='hppa' FEATURESET='none' FLAVOUR='parisc-smp' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-parisc-smp'
 binary-arch_hppa_none_parisc64: binary-arch_hppa_none_parisc64_real
 binary-arch_hppa_none_parisc64-smp: binary-arch_hppa_none_parisc64-smp_real
 binary-arch_hppa_none_parisc64-smp_real::
 	ln -sf linux-image.NEWS debian/linux-image-parisc64-smp.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-parisc64-smp -plinux-headers-parisc64-smp' ABINAME='3.2.0-4' ARCH='hppa' FEATURESET='none' FLAVOUR='parisc64-smp' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-parisc64-smp'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-parisc64-smp -plinux-headers-parisc64-smp' ABINAME='3.2.0-4' ARCH='hppa' FEATURESET='none' FLAVOUR='parisc64-smp' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-parisc64-smp'
 binary-arch_hppa_none_parisc64_real::
 	ln -sf linux-image.NEWS debian/linux-image-parisc64.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-parisc64 -plinux-headers-parisc64' ABINAME='3.2.0-4' ARCH='hppa' FEATURESET='none' FLAVOUR='parisc64' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-parisc64'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-parisc64 -plinux-headers-parisc64' ABINAME='3.2.0-4' ARCH='hppa' FEATURESET='none' FLAVOUR='parisc64' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-parisc64'
 binary-arch_hppa_none_parisc_real::
 	ln -sf linux-image.NEWS debian/linux-image-parisc.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-parisc -plinux-headers-parisc' ABINAME='3.2.0-4' ARCH='hppa' FEATURESET='none' FLAVOUR='parisc' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-parisc'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-parisc -plinux-headers-parisc' ABINAME='3.2.0-4' ARCH='hppa' FEATURESET='none' FLAVOUR='parisc' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-parisc'
 binary-arch_hppa_none_real:
 binary-arch_hppa_real:
 binary-arch_i386: binary-arch_i386_extra binary-arch_i386_none binary-arch_i386_real binary-arch_i386_rt
 binary-arch_i386_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-headers-2.6-486' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-headers-2.6-686-pae' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-headers-2.6-amd64' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-2.6-486' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-headers-2.6-486' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-headers-2.6-686-pae' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-headers-2.6-amd64' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-2.6-486' GENCONTROL_ARGS='-v3.6+46+rpi1'
 	ln -sf linux-image-686.config debian/linux-image-2.6-686.config
 	ln -sf linux-image-686.postinst debian/linux-image-2.6-686.postinst
 	ln -sf linux-image-686.templates debian/linux-image-2.6-686.templates
-	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-2.6-686' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-2.6-686-bigmem' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-2.6-686-pae' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-2.6-amd64' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-686' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-686-bigmem' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-pxen-linux-system-2.6-xen-686' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-2.6-686' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-2.6-686-bigmem' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-2.6-686-pae' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-2.6-amd64' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-686' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-686-bigmem' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-pxen-linux-system-2.6-xen-686' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_i386_none: binary-arch_i386_none_486 binary-arch_i386_none_686-pae binary-arch_i386_none_amd64 binary-arch_i386_none_real
 binary-arch_i386_none_486: binary-arch_i386_none_486_real
 binary-arch_i386_none_486_real::
 	ln -sf linux-image.NEWS debian/linux-image-486.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-486 -plinux-headers-486' ABINAME='3.2.0-4' ARCH='i386' FEATURESET='none' FLAVOUR='486' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-486'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-486 -plinux-headers-486' ABINAME='3.2.0-4' ARCH='i386' FEATURESET='none' FLAVOUR='486' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-486'
 binary-arch_i386_none_686-pae: binary-arch_i386_none_686-pae_real
 binary-arch_i386_none_686-pae_real::
 	ln -sf linux-image.NEWS debian/linux-image-686-pae.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-686-pae -plinux-headers-686-pae -pxen-linux-system-686-pae' ABINAME='3.2.0-4' ARCH='i386' FEATURESET='none' FLAVOUR='686-pae' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-686-pae'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-686-pae -plinux-headers-686-pae -pxen-linux-system-686-pae' ABINAME='3.2.0-4' ARCH='i386' FEATURESET='none' FLAVOUR='686-pae' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-686-pae'
 binary-arch_i386_none_amd64: binary-arch_i386_none_amd64_real
 binary-arch_i386_none_amd64_real::
 	ln -sf linux-image.NEWS debian/linux-image-amd64.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-amd64 -plinux-headers-amd64 -pxen-linux-system-amd64' ABINAME='3.2.0-4' ARCH='i386' FEATURESET='none' FLAVOUR='amd64' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-amd64'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-amd64 -plinux-headers-amd64 -pxen-linux-system-amd64' ABINAME='3.2.0-4' ARCH='i386' FEATURESET='none' FLAVOUR='amd64' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-amd64'
 binary-arch_i386_none_real:
 binary-arch_i386_real:
 binary-arch_i386_rt: binary-arch_i386_rt_686-pae binary-arch_i386_rt_real
 binary-arch_i386_rt_686-pae: binary-arch_i386_rt_686-pae_real
 binary-arch_i386_rt_686-pae_real::
 	ln -sf linux-image.NEWS debian/linux-image-rt-686-pae.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-rt-686-pae -plinux-headers-rt-686-pae' ABINAME='3.2.0-4' ARCH='i386' FEATURESET='rt' FLAVOUR='686-pae' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-rt-686-pae'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-rt-686-pae -plinux-headers-rt-686-pae' ABINAME='3.2.0-4' ARCH='i386' FEATURESET='rt' FLAVOUR='686-pae' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-rt-686-pae'
 binary-arch_i386_rt_real:
 binary-arch_ia64: binary-arch_ia64_extra binary-arch_ia64_none binary-arch_ia64_real
 binary-arch_ia64_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='ia64' DH_OPTIONS='-plinux-headers-2.6-itanium' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='ia64' DH_OPTIONS='-plinux-headers-2.6-mckinley' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='ia64' DH_OPTIONS='-plinux-image-2.6-itanium' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='ia64' DH_OPTIONS='-plinux-image-2.6-mckinley' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='ia64' DH_OPTIONS='-plinux-headers-2.6-itanium' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='ia64' DH_OPTIONS='-plinux-headers-2.6-mckinley' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='ia64' DH_OPTIONS='-plinux-image-2.6-itanium' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='ia64' DH_OPTIONS='-plinux-image-2.6-mckinley' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_ia64_none: binary-arch_ia64_none_itanium binary-arch_ia64_none_mckinley binary-arch_ia64_none_real
 binary-arch_ia64_none_itanium: binary-arch_ia64_none_itanium_real
 binary-arch_ia64_none_itanium_real::
 	ln -sf linux-image.NEWS debian/linux-image-itanium.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-itanium -plinux-headers-itanium' ABINAME='3.2.0-4' ARCH='ia64' FEATURESET='none' FLAVOUR='itanium' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-itanium'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-itanium -plinux-headers-itanium' ABINAME='3.2.0-4' ARCH='ia64' FEATURESET='none' FLAVOUR='itanium' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-itanium'
 binary-arch_ia64_none_mckinley: binary-arch_ia64_none_mckinley_real
 binary-arch_ia64_none_mckinley_real::
 	ln -sf linux-image.NEWS debian/linux-image-mckinley.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-mckinley -plinux-headers-mckinley' ABINAME='3.2.0-4' ARCH='ia64' FEATURESET='none' FLAVOUR='mckinley' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-mckinley'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-mckinley -plinux-headers-mckinley' ABINAME='3.2.0-4' ARCH='ia64' FEATURESET='none' FLAVOUR='mckinley' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-mckinley'
 binary-arch_ia64_none_real:
 binary-arch_ia64_real:
 binary-arch_m68k: binary-arch_m68k_extra binary-arch_m68k_none binary-arch_m68k_real
 binary-arch_m68k_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-headers-2.6-amiga' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-headers-2.6-atari' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-headers-2.6-bvme6000' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-headers-2.6-mac' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-headers-2.6-mvme147' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-headers-2.6-mvme16x' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-image-2.6-amiga' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-image-2.6-atari' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-image-2.6-bvme6000' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-image-2.6-mac' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-image-2.6-mvme147' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-image-2.6-mvme16x' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-headers-2.6-amiga' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-headers-2.6-atari' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-headers-2.6-bvme6000' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-headers-2.6-mac' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-headers-2.6-mvme147' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-headers-2.6-mvme16x' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-image-2.6-amiga' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-image-2.6-atari' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-image-2.6-bvme6000' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-image-2.6-mac' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-image-2.6-mvme147' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='m68k' DH_OPTIONS='-plinux-image-2.6-mvme16x' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_m68k_none: binary-arch_m68k_none_amiga binary-arch_m68k_none_atari binary-arch_m68k_none_bvme6000 binary-arch_m68k_none_mac binary-arch_m68k_none_mvme147 binary-arch_m68k_none_mvme16x binary-arch_m68k_none_real
 binary-arch_m68k_none_amiga: binary-arch_m68k_none_amiga_real
 binary-arch_m68k_none_amiga_real::
 	ln -sf linux-image.NEWS debian/linux-image-amiga.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-amiga -plinux-headers-amiga' ABINAME='3.2.0-4' ARCH='m68k' FEATURESET='none' FLAVOUR='amiga' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-amiga'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-amiga -plinux-headers-amiga' ABINAME='3.2.0-4' ARCH='m68k' FEATURESET='none' FLAVOUR='amiga' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-amiga'
 binary-arch_m68k_none_atari: binary-arch_m68k_none_atari_real
 binary-arch_m68k_none_atari_real::
 	ln -sf linux-image.NEWS debian/linux-image-atari.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-atari -plinux-headers-atari' ABINAME='3.2.0-4' ARCH='m68k' FEATURESET='none' FLAVOUR='atari' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-atari'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-atari -plinux-headers-atari' ABINAME='3.2.0-4' ARCH='m68k' FEATURESET='none' FLAVOUR='atari' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-atari'
 binary-arch_m68k_none_bvme6000: binary-arch_m68k_none_bvme6000_real
 binary-arch_m68k_none_bvme6000_real::
 	ln -sf linux-image.NEWS debian/linux-image-bvme6000.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-bvme6000 -plinux-headers-bvme6000' ABINAME='3.2.0-4' ARCH='m68k' FEATURESET='none' FLAVOUR='bvme6000' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-bvme6000'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-bvme6000 -plinux-headers-bvme6000' ABINAME='3.2.0-4' ARCH='m68k' FEATURESET='none' FLAVOUR='bvme6000' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-bvme6000'
 binary-arch_m68k_none_mac: binary-arch_m68k_none_mac_real
 binary-arch_m68k_none_mac_real::
 	ln -sf linux-image.NEWS debian/linux-image-mac.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-mac -plinux-headers-mac' ABINAME='3.2.0-4' ARCH='m68k' FEATURESET='none' FLAVOUR='mac' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-mac'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-mac -plinux-headers-mac' ABINAME='3.2.0-4' ARCH='m68k' FEATURESET='none' FLAVOUR='mac' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-mac'
 binary-arch_m68k_none_mvme147: binary-arch_m68k_none_mvme147_real
 binary-arch_m68k_none_mvme147_real::
 	ln -sf linux-image.NEWS debian/linux-image-mvme147.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-mvme147 -plinux-headers-mvme147' ABINAME='3.2.0-4' ARCH='m68k' FEATURESET='none' FLAVOUR='mvme147' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-mvme147'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-mvme147 -plinux-headers-mvme147' ABINAME='3.2.0-4' ARCH='m68k' FEATURESET='none' FLAVOUR='mvme147' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-mvme147'
 binary-arch_m68k_none_mvme16x: binary-arch_m68k_none_mvme16x_real
 binary-arch_m68k_none_mvme16x_real::
 	ln -sf linux-image.NEWS debian/linux-image-mvme16x.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-mvme16x -plinux-headers-mvme16x' ABINAME='3.2.0-4' ARCH='m68k' FEATURESET='none' FLAVOUR='mvme16x' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-mvme16x'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-mvme16x -plinux-headers-mvme16x' ABINAME='3.2.0-4' ARCH='m68k' FEATURESET='none' FLAVOUR='mvme16x' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-mvme16x'
 binary-arch_m68k_none_real:
 binary-arch_m68k_real:
 binary-arch_mips: binary-arch_mips_extra binary-arch_mips_none binary-arch_mips_real
 binary-arch_mips_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-headers-2.6-4kc-malta' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-headers-2.6-5kc-malta' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-headers-2.6-octeon' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-headers-2.6-r4k-ip22' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-headers-2.6-r5k-ip32' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-headers-2.6-sb1-bcm91250a' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-headers-2.6-sb1a-bcm91480b' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-image-2.6-4kc-malta' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-image-2.6-5kc-malta' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-image-2.6-octeon' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-image-2.6-r4k-ip22' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-image-2.6-r5k-ip32' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-image-2.6-sb1-bcm91250a' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-image-2.6-sb1a-bcm91480b' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-headers-2.6-4kc-malta' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-headers-2.6-5kc-malta' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-headers-2.6-octeon' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-headers-2.6-r4k-ip22' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-headers-2.6-r5k-ip32' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-headers-2.6-sb1-bcm91250a' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-headers-2.6-sb1a-bcm91480b' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-image-2.6-4kc-malta' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-image-2.6-5kc-malta' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-image-2.6-octeon' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-image-2.6-r4k-ip22' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-image-2.6-r5k-ip32' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-image-2.6-sb1-bcm91250a' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mips' DH_OPTIONS='-plinux-image-2.6-sb1a-bcm91480b' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_mips_none: binary-arch_mips_none_4kc-malta binary-arch_mips_none_5kc-malta binary-arch_mips_none_octeon binary-arch_mips_none_r4k-ip22 binary-arch_mips_none_r5k-ip32 binary-arch_mips_none_real binary-arch_mips_none_sb1-bcm91250a binary-arch_mips_none_sb1a-bcm91480b
 binary-arch_mips_none_4kc-malta: binary-arch_mips_none_4kc-malta_real
 binary-arch_mips_none_4kc-malta_real::
 	ln -sf linux-image.NEWS debian/linux-image-4kc-malta.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-4kc-malta -plinux-headers-4kc-malta' ABINAME='3.2.0-4' ARCH='mips' FEATURESET='none' FLAVOUR='4kc-malta' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-4kc-malta'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-4kc-malta -plinux-headers-4kc-malta' ABINAME='3.2.0-4' ARCH='mips' FEATURESET='none' FLAVOUR='4kc-malta' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-4kc-malta'
 binary-arch_mips_none_5kc-malta: binary-arch_mips_none_5kc-malta_real
 binary-arch_mips_none_5kc-malta_real::
 	ln -sf linux-image.NEWS debian/linux-image-5kc-malta.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-5kc-malta -plinux-headers-5kc-malta' ABINAME='3.2.0-4' ARCH='mips' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-5kc-malta'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-5kc-malta -plinux-headers-5kc-malta' ABINAME='3.2.0-4' ARCH='mips' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-5kc-malta'
 binary-arch_mips_none_octeon: binary-arch_mips_none_octeon_real
 binary-arch_mips_none_octeon_real::
 	ln -sf linux-image.NEWS debian/linux-image-octeon.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-octeon -plinux-headers-octeon' ABINAME='3.2.0-4' ARCH='mips' FEATURESET='none' FLAVOUR='octeon' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-octeon'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-octeon -plinux-headers-octeon' ABINAME='3.2.0-4' ARCH='mips' FEATURESET='none' FLAVOUR='octeon' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-octeon'
 binary-arch_mips_none_r4k-ip22: binary-arch_mips_none_r4k-ip22_real
 binary-arch_mips_none_r4k-ip22_real::
 	ln -sf linux-image.NEWS debian/linux-image-r4k-ip22.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-r4k-ip22 -plinux-headers-r4k-ip22' ABINAME='3.2.0-4' ARCH='mips' FEATURESET='none' FLAVOUR='r4k-ip22' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-r4k-ip22'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-r4k-ip22 -plinux-headers-r4k-ip22' ABINAME='3.2.0-4' ARCH='mips' FEATURESET='none' FLAVOUR='r4k-ip22' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-r4k-ip22'
 binary-arch_mips_none_r5k-ip32: binary-arch_mips_none_r5k-ip32_real
 binary-arch_mips_none_r5k-ip32_real::
 	ln -sf linux-image.NEWS debian/linux-image-r5k-ip32.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-r5k-ip32 -plinux-headers-r5k-ip32' ABINAME='3.2.0-4' ARCH='mips' FEATURESET='none' FLAVOUR='r5k-ip32' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-r5k-ip32'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-r5k-ip32 -plinux-headers-r5k-ip32' ABINAME='3.2.0-4' ARCH='mips' FEATURESET='none' FLAVOUR='r5k-ip32' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-r5k-ip32'
 binary-arch_mips_none_real:
 binary-arch_mips_none_sb1-bcm91250a: binary-arch_mips_none_sb1-bcm91250a_real
 binary-arch_mips_none_sb1-bcm91250a_real::
 	ln -sf linux-image.NEWS debian/linux-image-sb1-bcm91250a.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sb1-bcm91250a -plinux-headers-sb1-bcm91250a' ABINAME='3.2.0-4' ARCH='mips' FEATURESET='none' FLAVOUR='sb1-bcm91250a' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-sb1-bcm91250a'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sb1-bcm91250a -plinux-headers-sb1-bcm91250a' ABINAME='3.2.0-4' ARCH='mips' FEATURESET='none' FLAVOUR='sb1-bcm91250a' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-sb1-bcm91250a'
 binary-arch_mips_none_sb1a-bcm91480b: binary-arch_mips_none_sb1a-bcm91480b_real
 binary-arch_mips_none_sb1a-bcm91480b_real::
 	ln -sf linux-image.NEWS debian/linux-image-sb1a-bcm91480b.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sb1a-bcm91480b -plinux-headers-sb1a-bcm91480b' ABINAME='3.2.0-4' ARCH='mips' FEATURESET='none' FLAVOUR='sb1a-bcm91480b' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-sb1a-bcm91480b'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sb1a-bcm91480b -plinux-headers-sb1a-bcm91480b' ABINAME='3.2.0-4' ARCH='mips' FEATURESET='none' FLAVOUR='sb1a-bcm91480b' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-sb1a-bcm91480b'
 binary-arch_mips_real:
 binary-arch_mipsel: binary-arch_mipsel_extra binary-arch_mipsel_none binary-arch_mipsel_real
 binary-arch_mipsel_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-headers-2.6-4kc-malta' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-headers-2.6-5kc-malta' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-headers-2.6-loongson-2f' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-headers-2.6-r5k-cobalt' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-headers-2.6-sb1-bcm91250a' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-headers-2.6-sb1a-bcm91480b' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-image-2.6-4kc-malta' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-image-2.6-5kc-malta' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-image-2.6-loongson-2f' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-image-2.6-r5k-cobalt' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-image-2.6-sb1-bcm91250a' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-image-2.6-sb1a-bcm91480b' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-headers-2.6-4kc-malta' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-headers-2.6-5kc-malta' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-headers-2.6-loongson-2f' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-headers-2.6-r5k-cobalt' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-headers-2.6-sb1-bcm91250a' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-headers-2.6-sb1a-bcm91480b' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-image-2.6-4kc-malta' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-image-2.6-5kc-malta' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-image-2.6-loongson-2f' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-image-2.6-r5k-cobalt' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-image-2.6-sb1-bcm91250a' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='mipsel' DH_OPTIONS='-plinux-image-2.6-sb1a-bcm91480b' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_mipsel_none: binary-arch_mipsel_none_4kc-malta binary-arch_mipsel_none_5kc-malta binary-arch_mipsel_none_loongson-2f binary-arch_mipsel_none_r5k-cobalt binary-arch_mipsel_none_real binary-arch_mipsel_none_sb1-bcm91250a binary-arch_mipsel_none_sb1a-bcm91480b
 binary-arch_mipsel_none_4kc-malta: binary-arch_mipsel_none_4kc-malta_real
 binary-arch_mipsel_none_4kc-malta_real::
 	ln -sf linux-image.NEWS debian/linux-image-4kc-malta.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-4kc-malta -plinux-headers-4kc-malta' ABINAME='3.2.0-4' ARCH='mipsel' FEATURESET='none' FLAVOUR='4kc-malta' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-4kc-malta'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-4kc-malta -plinux-headers-4kc-malta' ABINAME='3.2.0-4' ARCH='mipsel' FEATURESET='none' FLAVOUR='4kc-malta' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-4kc-malta'
 binary-arch_mipsel_none_5kc-malta: binary-arch_mipsel_none_5kc-malta_real
 binary-arch_mipsel_none_5kc-malta_real::
 	ln -sf linux-image.NEWS debian/linux-image-5kc-malta.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-5kc-malta -plinux-headers-5kc-malta' ABINAME='3.2.0-4' ARCH='mipsel' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-5kc-malta'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-5kc-malta -plinux-headers-5kc-malta' ABINAME='3.2.0-4' ARCH='mipsel' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-5kc-malta'
 binary-arch_mipsel_none_loongson-2f: binary-arch_mipsel_none_loongson-2f_real
 binary-arch_mipsel_none_loongson-2f_real::
 	ln -sf linux-image.NEWS debian/linux-image-loongson-2f.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-loongson-2f -plinux-headers-loongson-2f' ABINAME='3.2.0-4' ARCH='mipsel' FEATURESET='none' FLAVOUR='loongson-2f' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-loongson-2f'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-loongson-2f -plinux-headers-loongson-2f' ABINAME='3.2.0-4' ARCH='mipsel' FEATURESET='none' FLAVOUR='loongson-2f' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-loongson-2f'
 binary-arch_mipsel_none_r5k-cobalt: binary-arch_mipsel_none_r5k-cobalt_real
 binary-arch_mipsel_none_r5k-cobalt_real::
 	ln -sf linux-image.NEWS debian/linux-image-r5k-cobalt.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-r5k-cobalt -plinux-headers-r5k-cobalt' ABINAME='3.2.0-4' ARCH='mipsel' FEATURESET='none' FLAVOUR='r5k-cobalt' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-r5k-cobalt'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-r5k-cobalt -plinux-headers-r5k-cobalt' ABINAME='3.2.0-4' ARCH='mipsel' FEATURESET='none' FLAVOUR='r5k-cobalt' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-r5k-cobalt'
 binary-arch_mipsel_none_real:
 binary-arch_mipsel_none_sb1-bcm91250a: binary-arch_mipsel_none_sb1-bcm91250a_real
 binary-arch_mipsel_none_sb1-bcm91250a_real::
 	ln -sf linux-image.NEWS debian/linux-image-sb1-bcm91250a.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sb1-bcm91250a -plinux-headers-sb1-bcm91250a' ABINAME='3.2.0-4' ARCH='mipsel' FEATURESET='none' FLAVOUR='sb1-bcm91250a' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-sb1-bcm91250a'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sb1-bcm91250a -plinux-headers-sb1-bcm91250a' ABINAME='3.2.0-4' ARCH='mipsel' FEATURESET='none' FLAVOUR='sb1-bcm91250a' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-sb1-bcm91250a'
 binary-arch_mipsel_none_sb1a-bcm91480b: binary-arch_mipsel_none_sb1a-bcm91480b_real
 binary-arch_mipsel_none_sb1a-bcm91480b_real::
 	ln -sf linux-image.NEWS debian/linux-image-sb1a-bcm91480b.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sb1a-bcm91480b -plinux-headers-sb1a-bcm91480b' ABINAME='3.2.0-4' ARCH='mipsel' FEATURESET='none' FLAVOUR='sb1a-bcm91480b' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-sb1a-bcm91480b'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sb1a-bcm91480b -plinux-headers-sb1a-bcm91480b' ABINAME='3.2.0-4' ARCH='mipsel' FEATURESET='none' FLAVOUR='sb1a-bcm91480b' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-sb1a-bcm91480b'
 binary-arch_mipsel_real:
 binary-arch_powerpc: binary-arch_powerpc_extra binary-arch_powerpc_none binary-arch_powerpc_real
 binary-arch_powerpc_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='powerpc' DH_OPTIONS='-plinux-headers-2.6-powerpc' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='powerpc' DH_OPTIONS='-plinux-headers-2.6-powerpc-smp' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='powerpc' DH_OPTIONS='-plinux-headers-2.6-powerpc64' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='powerpc' DH_OPTIONS='-plinux-image-2.6-powerpc' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='powerpc' DH_OPTIONS='-plinux-image-2.6-powerpc-smp' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='powerpc' DH_OPTIONS='-plinux-image-2.6-powerpc64' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='powerpc' DH_OPTIONS='-plinux-headers-2.6-powerpc' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='powerpc' DH_OPTIONS='-plinux-headers-2.6-powerpc-smp' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='powerpc' DH_OPTIONS='-plinux-headers-2.6-powerpc64' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='powerpc' DH_OPTIONS='-plinux-image-2.6-powerpc' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='powerpc' DH_OPTIONS='-plinux-image-2.6-powerpc-smp' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='powerpc' DH_OPTIONS='-plinux-image-2.6-powerpc64' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_powerpc_none: binary-arch_powerpc_none_powerpc binary-arch_powerpc_none_powerpc-smp binary-arch_powerpc_none_powerpc64 binary-arch_powerpc_none_real
 binary-arch_powerpc_none_powerpc: binary-arch_powerpc_none_powerpc_real
 binary-arch_powerpc_none_powerpc-smp: binary-arch_powerpc_none_powerpc-smp_real
 binary-arch_powerpc_none_powerpc-smp_real::
 	ln -sf linux-image.NEWS debian/linux-image-powerpc-smp.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-powerpc-smp -plinux-headers-powerpc-smp' ABINAME='3.2.0-4' ARCH='powerpc' FEATURESET='none' FLAVOUR='powerpc-smp' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-powerpc-smp'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-powerpc-smp -plinux-headers-powerpc-smp' ABINAME='3.2.0-4' ARCH='powerpc' FEATURESET='none' FLAVOUR='powerpc-smp' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-powerpc-smp'
 binary-arch_powerpc_none_powerpc64: binary-arch_powerpc_none_powerpc64_real
 binary-arch_powerpc_none_powerpc64_real::
 	ln -sf linux-image.NEWS debian/linux-image-powerpc64.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-powerpc64 -plinux-headers-powerpc64' ABINAME='3.2.0-4' ARCH='powerpc' FEATURESET='none' FLAVOUR='powerpc64' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-powerpc64'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-powerpc64 -plinux-headers-powerpc64' ABINAME='3.2.0-4' ARCH='powerpc' FEATURESET='none' FLAVOUR='powerpc64' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-powerpc64'
 binary-arch_powerpc_none_powerpc_real::
 	ln -sf linux-image.NEWS debian/linux-image-powerpc.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-powerpc -plinux-headers-powerpc' ABINAME='3.2.0-4' ARCH='powerpc' FEATURESET='none' FLAVOUR='powerpc' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-powerpc'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-powerpc -plinux-headers-powerpc' ABINAME='3.2.0-4' ARCH='powerpc' FEATURESET='none' FLAVOUR='powerpc' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-powerpc'
 binary-arch_powerpc_none_real:
 binary-arch_powerpc_real:
 binary-arch_ppc64: binary-arch_ppc64_extra binary-arch_ppc64_none binary-arch_ppc64_real
 binary-arch_ppc64_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='ppc64' DH_OPTIONS='-plinux-headers-2.6-powerpc64' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='ppc64' DH_OPTIONS='-plinux-image-2.6-powerpc64' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='ppc64' DH_OPTIONS='-plinux-headers-2.6-powerpc64' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='ppc64' DH_OPTIONS='-plinux-image-2.6-powerpc64' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_ppc64_none: binary-arch_ppc64_none_powerpc64 binary-arch_ppc64_none_real
 binary-arch_ppc64_none_powerpc64: binary-arch_ppc64_none_powerpc64_real
 binary-arch_ppc64_none_powerpc64_real::
 	ln -sf linux-image.NEWS debian/linux-image-powerpc64.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-powerpc64 -plinux-headers-powerpc64' ABINAME='3.2.0-4' ARCH='ppc64' FEATURESET='none' FLAVOUR='powerpc64' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-powerpc64'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-powerpc64 -plinux-headers-powerpc64' ABINAME='3.2.0-4' ARCH='ppc64' FEATURESET='none' FLAVOUR='powerpc64' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-powerpc64'
 binary-arch_ppc64_none_real:
 binary-arch_ppc64_real:
 binary-arch_s390: binary-arch_s390_extra binary-arch_s390_none binary-arch_s390_real
 binary-arch_s390_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='s390' DH_OPTIONS='-plinux-headers-2.6-s390x' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='s390' DH_OPTIONS='-plinux-image-2.6-s390x' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='s390' DH_OPTIONS='-plinux-image-2.6-s390x-tape' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='s390' DH_OPTIONS='-plinux-headers-2.6-s390x' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='s390' DH_OPTIONS='-plinux-image-2.6-s390x' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='s390' DH_OPTIONS='-plinux-image-2.6-s390x-tape' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_s390_none: binary-arch_s390_none_real binary-arch_s390_none_s390x binary-arch_s390_none_s390x-tape
 binary-arch_s390_none_real:
 binary-arch_s390_none_s390x: binary-arch_s390_none_s390x_real
 binary-arch_s390_none_s390x-tape: binary-arch_s390_none_s390x-tape_real
 binary-arch_s390_none_s390x-tape_real::
 	ln -sf linux-image.NEWS debian/linux-image-s390x-tape.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-s390x-tape' ABINAME='3.2.0-4' ARCH='s390' FEATURESET='none' FLAVOUR='s390x-tape' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-s390x-tape'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-s390x-tape' ABINAME='3.2.0-4' ARCH='s390' FEATURESET='none' FLAVOUR='s390x-tape' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-s390x-tape'
 binary-arch_s390_none_s390x_real::
 	ln -sf linux-image.NEWS debian/linux-image-s390x.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-s390x -plinux-headers-s390x' ABINAME='3.2.0-4' ARCH='s390' FEATURESET='none' FLAVOUR='s390x' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-s390x'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-s390x -plinux-headers-s390x' ABINAME='3.2.0-4' ARCH='s390' FEATURESET='none' FLAVOUR='s390x' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-s390x'
 binary-arch_s390_real:
 binary-arch_s390x: binary-arch_s390x_none binary-arch_s390x_real
 binary-arch_s390x_none: binary-arch_s390x_none_real binary-arch_s390x_none_s390x binary-arch_s390x_none_s390x-tape
@@ -375,64 +365,64 @@
 binary-arch_s390x_none_s390x-tape: binary-arch_s390x_none_s390x-tape_real
 binary-arch_s390x_none_s390x-tape_real::
 	ln -sf linux-image.NEWS debian/linux-image-s390x-tape.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-s390x-tape' ABINAME='3.2.0-4' ARCH='s390x' FEATURESET='none' FLAVOUR='s390x-tape' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-s390x-tape'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-s390x-tape' ABINAME='3.2.0-4' ARCH='s390x' FEATURESET='none' FLAVOUR='s390x-tape' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-s390x-tape'
 binary-arch_s390x_none_s390x_real::
 	ln -sf linux-image.NEWS debian/linux-image-s390x.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-s390x -plinux-headers-s390x' ABINAME='3.2.0-4' ARCH='s390x' FEATURESET='none' FLAVOUR='s390x' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-s390x'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-s390x -plinux-headers-s390x' ABINAME='3.2.0-4' ARCH='s390x' FEATURESET='none' FLAVOUR='s390x' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-s390x'
 binary-arch_s390x_real:
 binary-arch_sh4: binary-arch_sh4_extra binary-arch_sh4_none binary-arch_sh4_real
 binary-arch_sh4_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='sh4' DH_OPTIONS='-plinux-headers-2.6-sh7751r' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='sh4' DH_OPTIONS='-plinux-headers-2.6-sh7785lcr' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='sh4' DH_OPTIONS='-plinux-image-2.6-sh7751r' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='sh4' DH_OPTIONS='-plinux-image-2.6-sh7785lcr' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='sh4' DH_OPTIONS='-plinux-headers-2.6-sh7751r' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='sh4' DH_OPTIONS='-plinux-headers-2.6-sh7785lcr' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='sh4' DH_OPTIONS='-plinux-image-2.6-sh7751r' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='sh4' DH_OPTIONS='-plinux-image-2.6-sh7785lcr' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_sh4_none: binary-arch_sh4_none_real binary-arch_sh4_none_sh7751r binary-arch_sh4_none_sh7785lcr
 binary-arch_sh4_none_real:
 binary-arch_sh4_none_sh7751r: binary-arch_sh4_none_sh7751r_real
 binary-arch_sh4_none_sh7751r_real::
 	ln -sf linux-image.NEWS debian/linux-image-sh7751r.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sh7751r -plinux-headers-sh7751r' ABINAME='3.2.0-4' ARCH='sh4' FEATURESET='none' FLAVOUR='sh7751r' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-sh7751r'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sh7751r -plinux-headers-sh7751r' ABINAME='3.2.0-4' ARCH='sh4' FEATURESET='none' FLAVOUR='sh7751r' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-sh7751r'
 binary-arch_sh4_none_sh7785lcr: binary-arch_sh4_none_sh7785lcr_real
 binary-arch_sh4_none_sh7785lcr_real::
 	ln -sf linux-image.NEWS debian/linux-image-sh7785lcr.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sh7785lcr -plinux-headers-sh7785lcr' ABINAME='3.2.0-4' ARCH='sh4' FEATURESET='none' FLAVOUR='sh7785lcr' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-sh7785lcr'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sh7785lcr -plinux-headers-sh7785lcr' ABINAME='3.2.0-4' ARCH='sh4' FEATURESET='none' FLAVOUR='sh7785lcr' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-sh7785lcr'
 binary-arch_sh4_real:
 binary-arch_sparc: binary-arch_sparc_extra binary-arch_sparc_none binary-arch_sparc_real
 binary-arch_sparc64: binary-arch_sparc64_extra binary-arch_sparc64_none binary-arch_sparc64_real
 binary-arch_sparc64_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc64' DH_OPTIONS='-plinux-headers-2.6-sparc64' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc64' DH_OPTIONS='-plinux-headers-2.6-sparc64-smp' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc64' DH_OPTIONS='-plinux-image-2.6-sparc64' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc64' DH_OPTIONS='-plinux-image-2.6-sparc64-smp' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc64' DH_OPTIONS='-plinux-headers-2.6-sparc64' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc64' DH_OPTIONS='-plinux-headers-2.6-sparc64-smp' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc64' DH_OPTIONS='-plinux-image-2.6-sparc64' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc64' DH_OPTIONS='-plinux-image-2.6-sparc64-smp' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_sparc64_none: binary-arch_sparc64_none_real binary-arch_sparc64_none_sparc64 binary-arch_sparc64_none_sparc64-smp
 binary-arch_sparc64_none_real:
 binary-arch_sparc64_none_sparc64: binary-arch_sparc64_none_sparc64_real
 binary-arch_sparc64_none_sparc64-smp: binary-arch_sparc64_none_sparc64-smp_real
 binary-arch_sparc64_none_sparc64-smp_real::
 	ln -sf linux-image.NEWS debian/linux-image-sparc64-smp.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sparc64-smp -plinux-headers-sparc64-smp' ABINAME='3.2.0-4' ARCH='sparc64' FEATURESET='none' FLAVOUR='sparc64-smp' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-sparc64-smp'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sparc64-smp -plinux-headers-sparc64-smp' ABINAME='3.2.0-4' ARCH='sparc64' FEATURESET='none' FLAVOUR='sparc64-smp' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-sparc64-smp'
 binary-arch_sparc64_none_sparc64_real::
 	ln -sf linux-image.NEWS debian/linux-image-sparc64.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sparc64 -plinux-headers-sparc64' ABINAME='3.2.0-4' ARCH='sparc64' FEATURESET='none' FLAVOUR='sparc64' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-sparc64'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sparc64 -plinux-headers-sparc64' ABINAME='3.2.0-4' ARCH='sparc64' FEATURESET='none' FLAVOUR='sparc64' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-sparc64'
 binary-arch_sparc64_real:
 binary-arch_sparc_extra::
-	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc' DH_OPTIONS='-plinux-headers-2.6-sparc64' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc' DH_OPTIONS='-plinux-headers-2.6-sparc64-smp' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc' DH_OPTIONS='-plinux-image-2.6-sparc64' GENCONTROL_ARGS='-v3.2+46'
-	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc' DH_OPTIONS='-plinux-image-2.6-sparc64-smp' GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc' DH_OPTIONS='-plinux-headers-2.6-sparc64' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc' DH_OPTIONS='-plinux-headers-2.6-sparc64-smp' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc' DH_OPTIONS='-plinux-image-2.6-sparc64' GENCONTROL_ARGS='-v3.6+46+rpi1'
+	$(MAKE) -f debian/rules.real install-dummy ARCH='sparc' DH_OPTIONS='-plinux-image-2.6-sparc64-smp' GENCONTROL_ARGS='-v3.6+46+rpi1'
 binary-arch_sparc_none: binary-arch_sparc_none_real binary-arch_sparc_none_sparc64 binary-arch_sparc_none_sparc64-smp
 binary-arch_sparc_none_real:
 binary-arch_sparc_none_sparc64: binary-arch_sparc_none_sparc64_real
 binary-arch_sparc_none_sparc64-smp: binary-arch_sparc_none_sparc64-smp_real
 binary-arch_sparc_none_sparc64-smp_real::
 	ln -sf linux-image.NEWS debian/linux-image-sparc64-smp.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sparc64-smp -plinux-headers-sparc64-smp' ABINAME='3.2.0-4' ARCH='sparc' FEATURESET='none' FLAVOUR='sparc64-smp' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-sparc64-smp'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sparc64-smp -plinux-headers-sparc64-smp' ABINAME='3.2.0-4' ARCH='sparc' FEATURESET='none' FLAVOUR='sparc64-smp' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-sparc64-smp'
 binary-arch_sparc_none_sparc64_real::
 	ln -sf linux-image.NEWS debian/linux-image-sparc64.NEWS
-	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sparc64 -plinux-headers-sparc64' ABINAME='3.2.0-4' ARCH='sparc' FEATURESET='none' FLAVOUR='sparc64' GENCONTROL_ARGS='-v3.2+46' LOCALVERSION='-sparc64'
+	$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-plinux-image-sparc64 -plinux-headers-sparc64' ABINAME='3.2.0-4' ARCH='sparc' FEATURESET='none' FLAVOUR='sparc64' GENCONTROL_ARGS='-v3.2+46+rpi1' LOCALVERSION='-sparc64'
 binary-arch_sparc_real:
 binary-indep::
-	$(MAKE) -f debian/rules.real binary-indep GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real binary-indep GENCONTROL_ARGS='-v3.2+46+rpi1'
 build-arch: build-arch_alpha build-arch_amd64 build-arch_armel build-arch_armhf build-arch_hppa build-arch_i386 build-arch_ia64 build-arch_m68k build-arch_mips build-arch_mipsel build-arch_powerpc build-arch_ppc64 build-arch_s390 build-arch_s390x build-arch_sh4 build-arch_sparc build-arch_sparc64
 build-arch_alpha: build-arch_alpha_none build-arch_alpha_real
 build-arch_alpha_none: build-arch_alpha_none_alpha-generic build-arch_alpha_none_alpha-legacy build-arch_alpha_none_alpha-smp build-arch_alpha_none_real
@@ -471,14 +461,10 @@
 build-arch_armel_none_versatile_real:
 build-arch_armel_real:
 build-arch_armhf: build-arch_armhf_none build-arch_armhf_real
-build-arch_armhf_none: build-arch_armhf_none_mx5 build-arch_armhf_none_omap build-arch_armhf_none_real build-arch_armhf_none_vexpress
-build-arch_armhf_none_mx5: build-arch_armhf_none_mx5_real
-build-arch_armhf_none_mx5_real:
-build-arch_armhf_none_omap: build-arch_armhf_none_omap_real
-build-arch_armhf_none_omap_real:
+build-arch_armhf_none: build-arch_armhf_none_real build-arch_armhf_none_rpi
 build-arch_armhf_none_real:
-build-arch_armhf_none_vexpress: build-arch_armhf_none_vexpress_real
-build-arch_armhf_none_vexpress_real:
+build-arch_armhf_none_rpi: build-arch_armhf_none_rpi_real
+build-arch_armhf_none_rpi_real:
 build-arch_armhf_real:
 build-arch_hppa: build-arch_hppa_none build-arch_hppa_real
 build-arch_hppa_none: build-arch_hppa_none_parisc build-arch_hppa_none_parisc-smp build-arch_hppa_none_parisc64 build-arch_hppa_none_parisc64-smp build-arch_hppa_none_real
@@ -621,7 +607,7 @@
 build-arch_sparc_none_sparc64_real:
 build-arch_sparc_real:
 build-indep::
-	$(MAKE) -f debian/rules.real build-indep GENCONTROL_ARGS='-v3.2+46'
+	$(MAKE) -f debian/rules.real build-indep GENCONTROL_ARGS='-v3.2+46+rpi1'
 setup: setup_alpha setup_amd64 setup_armel setup_armhf setup_hppa setup_i386 setup_ia64 setup_m68k setup_mips setup_mipsel setup_powerpc setup_ppc64 setup_s390 setup_s390x setup_sh4 setup_sparc setup_sparc64
 setup_alpha: setup_alpha_none setup_alpha_real
 setup_alpha_none: setup_alpha_none_alpha-generic setup_alpha_none_alpha-legacy setup_alpha_none_alpha-smp setup_alpha_none_real
@@ -660,14 +646,10 @@
 setup_armel_none_versatile_real:
 setup_armel_real:
 setup_armhf: setup_armhf_none setup_armhf_real
-setup_armhf_none: setup_armhf_none_mx5 setup_armhf_none_omap setup_armhf_none_real setup_armhf_none_vexpress
-setup_armhf_none_mx5: setup_armhf_none_mx5_real
-setup_armhf_none_mx5_real:
-setup_armhf_none_omap: setup_armhf_none_omap_real
-setup_armhf_none_omap_real:
+setup_armhf_none: setup_armhf_none_real setup_armhf_none_rpi
 setup_armhf_none_real:
-setup_armhf_none_vexpress: setup_armhf_none_vexpress_real
-setup_armhf_none_vexpress_real:
+setup_armhf_none_rpi: setup_armhf_none_rpi_real
+setup_armhf_none_rpi_real:
 setup_armhf_real:
 setup_hppa: setup_hppa_none setup_hppa_real
 setup_hppa_none: setup_hppa_none_parisc setup_hppa_none_parisc-smp setup_hppa_none_parisc64 setup_hppa_none_parisc64-smp setup_hppa_none_real
diff -Nru linux-latest-46/debian/templates/control.extra.in linux-latest-46+rpi1/debian/templates/control.extra.in
--- linux-latest-46/debian/templates/control.extra.in	2012-10-07 18:51:03.000000000 +0000
+++ linux-latest-46+rpi1/debian/templates/control.extra.in	2013-08-02 19:33:22.000000000 +0000
@@ -145,13 +145,6 @@
 Description: Header files for Linux mvme16x configuration (dummy package)
  This is a dummy transitional package.  It can be safely removed.
 
-Package: linux-headers-2.6-mx5
-Architecture: armhf
-Section: oldlibs
-Depends: linux-headers-mx5, ${misc:Depends}
-Description: Header files for Linux mx5 configuration (dummy package)
- This is a dummy transitional package.  It can be safely removed.
-
 Package: linux-headers-2.6-octeon
 Architecture: mips
 Section: oldlibs
@@ -159,13 +152,6 @@
 Description: Header files for Linux octeon configuration (dummy package)
  This is a dummy transitional package.  It can be safely removed.
 
-Package: linux-headers-2.6-omap
-Architecture: armhf
-Section: oldlibs
-Depends: linux-headers-omap, ${misc:Depends}
-Description: Header files for Linux omap configuration (dummy package)
- This is a dummy transitional package.  It can be safely removed.
-
 Package: linux-headers-2.6-orion5x
 Architecture: armel
 Section: oldlibs
@@ -453,13 +439,6 @@
 Description: Linux for Motorola MVME162/6/7, MVME172/7 (dummy package)
  This is a dummy transitional package.  It can be safely removed.
 
-Package: linux-image-2.6-mx5
-Architecture: armhf
-Section: oldlibs
-Depends: linux-image-mx5, ${misc:Depends}
-Description: Linux for Freescale MXC/iMX-based (dummy package)
- This is a dummy transitional package.  It can be safely removed.
-
 Package: linux-image-2.6-octeon
 Architecture: mips
 Section: oldlibs
@@ -467,13 +446,6 @@
 Description: Linux for Octeon (dummy package)
  This is a dummy transitional package.  It can be safely removed.
 
-Package: linux-image-2.6-omap
-Architecture: armhf
-Section: oldlibs
-Depends: linux-image-omap, ${misc:Depends}
-Description: Linux for TI OMAP3+ (dummy package)
- This is a dummy transitional package.  It can be safely removed.
-
 Package: linux-image-2.6-orion5x
 Architecture: armel
 Section: oldlibs
@@ -655,3 +627,18 @@
 Depends: xen-linux-system-amd64, ${misc:Depends}
 Description: Xen system with Linux for 64-bit PCs (dummy package)
  This is a dummy transitional package.  It can be safely removed.
+
+Package: linux-image-rpi-rpfv
+Architecture: armhf
+Depends: linux-image-3.6-trunk-rpi
+Description:
+ This metapackage will pull in the raspbian kernel based on the version 
+ currently reccomended by the raspberry pi foundation (currently 3.6).
+
+Package: linux-headers-rpi-rpfv
+Architecture: armhf
+Depends: linux-headers-3.6-trunk-rpi
+Description:
+ This metapackage will pull in the headers for the raspbian kernel based on the
+ version of linux currently reccomended by the raspberry pi foundation
+ (currently 3.6).