diff --git a/debian/grub-common.install.in b/debian/grub-common.install.in
index 3acf27efa..907fb79bc 100644
--- a/debian/grub-common.install.in
+++ b/debian/grub-common.install.in
@@ -13,6 +13,7 @@ usr/bin/grub-mkimage
 usr/bin/grub-mklayout
 usr/bin/grub-mkpasswd-pbkdf2
 usr/bin/grub-mkrelpath
+usr/bin/grub-mkstandalone
 usr/bin/grub-script-check
 usr/sbin/grub-mkconfig
 usr/sbin/grub-mkdevicemap
@@ -21,12 +22,14 @@ usr/share/grub
 usr/share/locale
 usr/share/man/man1/grub-editenv.1
 usr/share/man/man1/grub-fstest.1
+usr/share/man/man1/grub-kbdcomp.1
 usr/share/man/man1/grub-menulst2cfg.1
 usr/share/man/man1/grub-mkfont.1
 usr/share/man/man1/grub-mkimage.1
 usr/share/man/man1/grub-mklayout.1
 usr/share/man/man1/grub-mkpasswd-pbkdf2.1
 usr/share/man/man1/grub-mkrelpath.1
+usr/share/man/man1/grub-mkstandalone.1
 usr/share/man/man1/grub-script-check.1
 usr/share/man/man8/grub-mkconfig.8
 usr/share/man/man8/grub-mkdevicemap.8
diff --git a/debian/grub-common.install.mipsel.in b/debian/grub-common.install.mipsel.in
new file mode 100644
index 000000000..f5f3231fd
--- /dev/null
+++ b/debian/grub-common.install.mipsel.in
@@ -0,0 +1,2 @@
+usr/bin/grub-mkrescue
+usr/share/man/man1/grub-mkrescue.1
diff --git a/debian/grub-common.links b/debian/grub-common.links
index 51f7f2123..9ec332a3d 100644
--- a/debian/grub-common.links
+++ b/debian/grub-common.links
@@ -1,2 +1 @@
 usr/share/grub/grub-mkconfig_lib	usr/lib/grub/grub-mkconfig_lib
-usr/share/grub/update-grub_lib		usr/lib/grub/update-grub_lib
diff --git a/debian/grub-ieee1275.install.sparc.in b/debian/grub-ieee1275.install.sparc.in
index 2f1e450c7..dbd0bf9ae 100644
--- a/debian/grub-ieee1275.install.sparc.in
+++ b/debian/grub-ieee1275.install.sparc.in
@@ -1,2 +1,2 @@
-usr/sbin/grub-setup
-usr/share/man/man8/grub-setup.8
+usr/sbin/grub-sparc64-setup
+usr/share/man/man8/grub-sparc64-setup.8
diff --git a/debian/grub-pc-bin.install.in b/debian/grub-pc-bin.install.in
index 71d2605c1..9cbe5b6d1 100644
--- a/debian/grub-pc-bin.install.in
+++ b/debian/grub-pc-bin.install.in
@@ -1,2 +1,2 @@
 usr/bin/grub-ntldr-img			usr/lib/grub/@CPU_PLATFORM@
-usr/sbin/grub-setup			usr/lib/grub/@CPU_PLATFORM@
+usr/sbin/grub-bios-setup		usr/lib/grub/@CPU_PLATFORM@
diff --git a/debian/grub-pc.install.in b/debian/grub-pc.install.in
index c7b3b35ff..33ca9f306 100644
--- a/debian/grub-pc.install.in
+++ b/debian/grub-pc.install.in
@@ -1,4 +1,4 @@
 ../../debian/legacy/update-grub			usr/lib/grub-legacy
 ../../debian/legacy/upgrade-from-grub-legacy	usr/sbin
 
-usr/share/man/man8/grub-setup.8
+usr/share/man/man8/grub-bios-setup.8
diff --git a/debian/grub-pc.links.in b/debian/grub-pc.links.in
index 42c9905c6..e2c542e56 100644
--- a/debian/grub-pc.links.in
+++ b/debian/grub-pc.links.in
@@ -1,2 +1,2 @@
 usr/lib/grub/@CPU_PLATFORM@/grub-ntldr-img	usr/bin/grub-ntldr-img
-usr/lib/grub/@CPU_PLATFORM@/grub-setup		usr/sbin/grub-setup
+usr/lib/grub/@CPU_PLATFORM@/grub-bios-setup	usr/sbin/grub-bios-setup