diff --git a/debian/changelog b/debian/changelog
index e8fea13bc..145918081 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (4.6.1-2) UNRELEASED; urgency=medium
+
+  * bug script: Put binary package name and version in the info file so
+    linux-signed can easily replace them
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Tue, 07 Jun 2016 19:37:55 +0100
+
 linux (4.6.1-1) unstable; urgency=medium
 
   * New upstream stable update:
diff --git a/debian/rules.real b/debian/rules.real
index d4727705d..550cdb0c1 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -420,7 +420,7 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_bug:
 	dh_installdirs usr/share/bug/$(PACKAGE_NAME)
 	dh_install debian/templates/image.bug/* usr/share/bug/$(PACKAGE_NAME)
 	chmod 755 $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/script
-	printf "RELEASE='$(REAL_VERSION)'\nDISTRIBUTOR='$(DISTRIBUTOR)'\nSOURCEVERSION='$(SOURCEVERSION)'\n" > $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/info
+	printf "RELEASE='$(REAL_VERSION)'\nDISTRIBUTOR='$(DISTRIBUTOR)'\nSOURCEVERSION='$(SOURCEVERSION)'\nPACKAGE_NAME='$(PACKAGE_NAME)'\nPACKAGE_VERSION='$(SOURCEVERSION)'" > $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/info
 
 install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
 install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME = linux-image-$(REAL_VERSION)-dbg
diff --git a/debian/templates/image.bug/script b/debian/templates/image.bug/script
index 3926d8f66..8e0b5d557 100644
--- a/debian/templates/image.bug/script
+++ b/debian/templates/image.bug/script
@@ -19,8 +19,8 @@ if [ "$RELEASE" == "$(uname -r)" ]; then
   running_ver="${running_ver%% *}"
   if [ "$running_ver" != "$SOURCEVERSION" ]; then
     cat <<EOF
-You have installed version $SOURCEVERSION of
-linux-image-$RELEASE, but version $running_ver is currently
+You have installed version $PACKAGE_VERSION of
+$PACKAGE_NAME, but version $running_ver is currently
 running.
 
 You should reboot to complete the upgrade.  Until you do this, some