diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic
index cf18e34..f9d3128 100644
--- a/meta-source/debian/control.d/generic
+++ b/meta-source/debian/control.d/generic
@@ -35,7 +35,7 @@ Description: Backported driver headers for generic kernel image
 Package: linux-backports-modules-wireless-RELEASE_NAME-generic
 Architecture: amd64 i386
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.34-${kernel-abi-version}-generic
-Conflicts: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic
+Conflicts: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic
 Description: Backported wireless drivers for generic kernel image
  This empty package allows people to keep their backported wireless modules
  up-to-date when upgrading their Linux kernel.
@@ -43,7 +43,15 @@ Description: Backported wireless drivers for generic kernel image
 Package: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic
 Architecture: amd64 i386
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.35-${kernel-abi-version}-generic
-Conflicts: linux-backports-modules-wireless-RELEASE_NAME-generic
+Conflicts: linux-backports-modules-wireless-RELEASE_NAME-generic, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic
+Description: Backported wireless drivers for generic kernel image
+ This empty package allows people to keep their backported wireless modules
+ up-to-date when upgrading their Linux kernel.
+
+Package: linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic
+Architecture: amd64 i386
+Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-generic
+Conflicts: linux-backports-modules-wireless-RELEASE_NAME-generic, linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic
 Description: Backported wireless drivers for generic kernel image
  This empty package allows people to keep their backported wireless modules
  up-to-date when upgrading their Linux kernel.
diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae
index 2edae5c..3bcff41 100644
--- a/meta-source/debian/control.d/generic-pae
+++ b/meta-source/debian/control.d/generic-pae
@@ -35,7 +35,7 @@ Description: Backported driver headers for generic-pae kernel image
 Package: linux-backports-modules-wireless-RELEASE_NAME-generic-pae
 Architecture: amd64 i386
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.34-${kernel-abi-version}-generic-pae
-Conflicts: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic-pae
+Conflicts: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic-pae, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic-pae
 Description: Backported wireless drivers for generic-pae kernel image
  This empty package allows people to keep their backported wireless modules
  up-to-date when upgrading their Linux kernel.
@@ -43,7 +43,15 @@ Description: Backported wireless drivers for generic-pae kernel image
 Package: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic-pae
 Architecture: amd64 i386
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.35-${kernel-abi-version}-generic-pae
-Conflicts: linux-backports-modules-wireless-RELEASE_NAME-generic-pae
+Conflicts: linux-backports-modules-wireless-RELEASE_NAME-generic-pae, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic-pae
+Description: Backported wireless drivers for generic-pae kernel image
+ This empty package allows people to keep their backported wireless modules
+ up-to-date when upgrading their Linux kernel.
+
+Package: linux-backports-modules-wireless-2.6.36-RELEASE_NAME-generic-pae
+Architecture: amd64 i386
+Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-generic-pae
+Conflicts: linux-backports-modules-wireless-RELEASE_NAME-generic-pae, linux-backports-modules-wireless-2.6.35-RELEASE_NAME-generic-pae
 Description: Backported wireless drivers for generic-pae kernel image
  This empty package allows people to keep their backported wireless modules
  up-to-date when upgrading their Linux kernel.
diff --git a/meta-source/debian/control.d/preempt b/meta-source/debian/control.d/preempt
index c63dc62..aec8303 100644
--- a/meta-source/debian/control.d/preempt
+++ b/meta-source/debian/control.d/preempt
@@ -35,7 +35,7 @@ Description: Backported driver headers for preempt kernel image
 Package: linux-backports-modules-wireless-RELEASE_NAME-preempt
 Architecture: amd64 i386
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.34-${kernel-abi-version}-preempt
-Conflicts: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-preempt
+Conflicts: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-preempt, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-preempt
 Description: Backported wireless drivers for preempt kernel image
  This empty package allows people to keep their backported wireless modules
  up-to-date when upgrading their Linux kernel.
@@ -43,7 +43,15 @@ Description: Backported wireless drivers for preempt kernel image
 Package: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-preempt
 Architecture: amd64 i386
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.35-${kernel-abi-version}-preempt
-Conflicts: linux-backports-modules-wireless-RELEASE_NAME-preempt
+Conflicts: linux-backports-modules-wireless-RELEASE_NAME-preempt, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-preempt
+Description: Backported wireless drivers for preempt kernel image
+ This empty package allows people to keep their backported wireless modules
+ up-to-date when upgrading their Linux kernel.
+
+Package: linux-backports-modules-wireless-2.6.36-RELEASE_NAME-preempt
+Architecture: amd64 i386
+Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-preempt
+Conflicts: linux-backports-modules-wireless-RELEASE_NAME-preempt, linux-backports-modules-wireless-2.6.35-RELEASE_NAME-preempt
 Description: Backported wireless drivers for preempt kernel image
  This empty package allows people to keep their backported wireless modules
  up-to-date when upgrading their Linux kernel.
diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server
index 3850666..524bea1 100644
--- a/meta-source/debian/control.d/server
+++ b/meta-source/debian/control.d/server
@@ -35,7 +35,7 @@ Description: Backported driver headers for server kernel image
 Package: linux-backports-modules-wireless-RELEASE_NAME-server
 Architecture: amd64 i386
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.34-${kernel-abi-version}-server
-Conflicts: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-server
+Conflicts: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-server, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-server
 Description: Backported wireless drivers for server kernel image
  This empty package allows people to keep their backported wireless modules
  up-to-date when upgrading their Linux kernel.
@@ -43,7 +43,15 @@ Description: Backported wireless drivers for server kernel image
 Package: linux-backports-modules-wireless-2.6.35-RELEASE_NAME-server
 Architecture: amd64 i386
 Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.35-${kernel-abi-version}-server
-Conflicts: linux-backports-modules-wireless-RELEASE_NAME-server
+Conflicts: linux-backports-modules-wireless-RELEASE_NAME-server, linux-backports-modules-wireless-2.6.36-RELEASE_NAME-server
+Description: Backported wireless drivers for server kernel image
+ This empty package allows people to keep their backported wireless modules
+ up-to-date when upgrading their Linux kernel.
+
+Package: linux-backports-modules-wireless-2.6.36-RELEASE_NAME-server
+Architecture: amd64 i386
+Depends: ${misc:Depends}, linux-backports-modules-compat-wireless-2.6.36-${kernel-abi-version}-server
+Conflicts: linux-backports-modules-wireless-RELEASE_NAME-server, linux-backports-modules-wireless-2.6.35-RELEASE_NAME-server
 Description: Backported wireless drivers for server kernel image
  This empty package allows people to keep their backported wireless modules
  up-to-date when upgrading their Linux kernel.
