diff --git a/debian/changelog b/debian/changelog
index dad38ec56..a7e949ac5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-grub2 (1.95+20070514-1) UNRELEASED; urgency=low
+grub2 (1.95+20070515-1) unstable; urgency=low
 
   * New CVS snapshot.
     - Fix assumptions about /, /boot and /boot/grub being the same device.
@@ -37,6 +37,8 @@ grub2 (1.95+20070514-1) UNRELEASED; urgency=low
     to avoid duplicated work (this is specialy important for d-i).  (part of
     #423217).
   * See multiple references above.  (Closes: #423217)
+  * grub-{pc,efi,of}.{dirs,install}: Install presubj in the right directory
+    to make it work again (oops).
 
  -- Robert Millan <rmh@aybabtu.com>  Tue, 15 May 2007 19:56:44 +0200
 
diff --git a/debian/grub-efi.dirs b/debian/grub-efi.dirs
index 954844d4b..34e2d7124 100644
--- a/debian/grub-efi.dirs
+++ b/debian/grub-efi.dirs
@@ -1,4 +1,4 @@
 boot/grub
 usr/bin
 usr/sbin
-usr/share/bug/grub
+usr/share/bug/grub-efi
diff --git a/debian/grub-efi.install b/debian/grub-efi.install
index 74d522261..7148f3057 100644
--- a/debian/grub-efi.install
+++ b/debian/grub-efi.install
@@ -1,3 +1,3 @@
-debian/presubj		usr/share/bug/grub
+debian/presubj		usr/share/bug/grub-efi
 debian/default		etc
 build/unifont.pff	boot/grub
diff --git a/debian/grub-of.dirs b/debian/grub-of.dirs
index 954844d4b..b96ccfed0 100644
--- a/debian/grub-of.dirs
+++ b/debian/grub-of.dirs
@@ -1,4 +1,4 @@
 boot/grub
 usr/bin
 usr/sbin
-usr/share/bug/grub
+usr/share/bug/grub-of
diff --git a/debian/grub-of.install b/debian/grub-of.install
index 74d522261..6379e54be 100644
--- a/debian/grub-of.install
+++ b/debian/grub-of.install
@@ -1,3 +1,3 @@
-debian/presubj		usr/share/bug/grub
+debian/presubj		usr/share/bug/grub-of
 debian/default		etc
 build/unifont.pff	boot/grub
diff --git a/debian/grub-pc.dirs b/debian/grub-pc.dirs
index 484908f6d..e8b3a82ed 100644
--- a/debian/grub-pc.dirs
+++ b/debian/grub-pc.dirs
@@ -1,5 +1,5 @@
 boot/grub
 usr/bin
 usr/sbin
-usr/share/bug/grub
+usr/share/bug/grub-pc
 usr/lib/grub-legacy
diff --git a/debian/grub-pc.install b/debian/grub-pc.install
index 568eee588..4c91d9358 100644
--- a/debian/grub-pc.install
+++ b/debian/grub-pc.install
@@ -1,4 +1,4 @@
-debian/presubj		usr/share/bug/grub
+debian/presubj		usr/share/bug/grub-pc
 debian/default		etc
 build/unifont.pff	boot/grub
 debian/legacy/update-grub usr/lib/grub-legacy