diff --git a/debian/changelog b/debian/changelog
index cc09f431f..b8cd91190 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ linux-2.6 (2.6.31-1~experimental.2) UNRELEASED; urgency=low
 
   [ Ben Hutchings ]
   * Include model information in bug reports
+  * Include firmware package status in bug reports
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 04 Oct 2009 19:48:35 +0100
 
diff --git a/debian/templates/image.plain.bug/control b/debian/templates/image.plain.bug/control
index 128ba9831..d49f83d60 100644
--- a/debian/templates/image.plain.bug/control
+++ b/debian/templates/image.plain.bug/control
@@ -1 +1,2 @@
 Submit-As: linux-2.6
+Package-Status: firmware-bnx2 firmware-bnx2x firmware-ipw2x00 firmware-ivtv firmware-iwlwifi firmware-linux firmware-linux-nonfree firmware-qlogic firmware-ralink