diff --git a/debian/changelog b/debian/changelog
index 973db5d76..dfe49743c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux-2.6 (3.0.0-4) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * Make bug script accept failure of lspci (Closes: #639439)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 28 Aug 2011 17:07:47 +0100
+
 linux-2.6 (3.0.0-3) unstable; urgency=low
 
   [ Ben Hutchings ]
diff --git a/debian/templates/image.plain.bug/include-pci b/debian/templates/image.plain.bug/include-pci
index 53f9513ba..8e6528e5a 100644
--- a/debian/templates/image.plain.bug/include-pci
+++ b/debian/templates/image.plain.bug/include-pci
@@ -1,10 +1,6 @@
 add_pci() {
   echo '** PCI devices:' >&3
-  if command -v lspci > /dev/null; then
-    lspci -nnvv >&3
-  else
-    echo 'not available' >&3
-  fi
+  lspci -nnvv >&3 2>/dev/null || echo 'not available' >&3
   echo >&3
 }