diff --git a/debian/changelog b/debian/changelog
index ec980838e..9e93aa23e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,21 @@ grub2 (2.00-6) UNRELEASED; urgency=low
     kfreebsd-i386 and hurd-i386 don't have gcc-4.6-multilib.  Instead, make
     sure to only install efiemu32.o and efiemu64.o on (linux-)i386,
     kopensolaris-i386, and any-amd64.
+  * Manually expand @PACKAGE@ symbols in grub-efi.postinst (closes:
+    #688725), grub-linuxbios.postinst (closes: #688726), and grub2.postinst
+    (closes: #688724).
+
+  [ Debconf translations ]
+  * Lithuanian (Rimas Kudelis).  Closes: #675628
+  * Galician (Jorge Barreiro).  Closes: #677389
+  * Welsh (Daffyd Tomos).
+  * Greek (galaxico).  Closes: #685201
+  * Romanian (Andrei POPESCU).  Closes: #685477
+  * Finnish (Timo Jyrinki).
+
+  [ Cyril Brulebois ]
+  * Use xz compression for all binaries to save up some space on CD images
+    (closes: #688773).
 
  -- Colin Watson <cjwatson@debian.org>  Fri, 21 Sep 2012 17:20:21 +0100
 
@@ -134,6 +149,29 @@ grub2 (2.00-1) experimental; urgency=low
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 06 Sep 2012 19:04:21 +0100
 
+grub2 (1.99-23) unstable; urgency=low
+
+  [ Debconf translations ]
+  * Lithuanian (Rimas Kudelis).  Closes: #675628
+  * Galician (Jorge Barreiro).  Closes: #677389
+  * Welsh (Daffyd Tomos).
+  * Greek (galaxico).  Closes: #685201
+  * Romanian (Andrei POPESCU).  Closes: #685477
+  * Finnish (Timo Jyrinki).
+
+  [ Cyril Brulebois ]
+  * Use xz compression for all binaries to save up some space on CD images
+    (closes: #688773).
+
+  [ Colin Watson ]
+  * Autogenerate packaging files for grub-emu (closes: #688727), in order
+    that its postinst does not contain unexpanded @PACKAGE@ symbols.
+  * Manually expand @PACKAGE@ symbols in grub-efi.postinst (closes:
+    #688725), grub-linuxbios.postinst (closes: #688726), and grub2.postinst
+    (closes: #688724).
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 25 Sep 2012 18:59:18 +0100
+
 grub2 (1.99-22.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/grub-efi.postinst b/debian/grub-efi.postinst
index d5d90a693..bbef6abe0 100644
--- a/debian/grub-efi.postinst
+++ b/debian/grub-efi.postinst
@@ -3,11 +3,11 @@ set -e
 
 case "$1" in
   configure)
-    if dpkg --compare-versions "$2" lt-nl 1.99-1; then
+    if dpkg --compare-versions "$2" lt-nl 2.00-6; then
       # Force dpkg to replace this directory with a symlink.
-      if [ ! -L /usr/share/doc/@PACKAGE@ ] && [ -d /usr/share/doc/@PACKAGE@ ]; then
-        if rmdir /usr/share/doc/@PACKAGE@ 2>/dev/null; then
-          ln -sf grub-common /usr/share/doc/@PACKAGE@
+      if [ ! -L /usr/share/doc/grub-efi ] && [ -d /usr/share/doc/grub-efi ]; then
+        if rmdir /usr/share/doc/grub-efi 2>/dev/null; then
+          ln -sf grub-common /usr/share/doc/grub-efi
         fi
       fi
     fi
diff --git a/debian/grub-emu.postinst.in b/debian/grub-emu.postinst.in
index d5d90a693..6c0446f1b 100644
--- a/debian/grub-emu.postinst.in
+++ b/debian/grub-emu.postinst.in
@@ -3,7 +3,7 @@ set -e
 
 case "$1" in
   configure)
-    if dpkg --compare-versions "$2" lt-nl 1.99-1; then
+    if dpkg --compare-versions "$2" lt-nl 2.00-2; then
       # Force dpkg to replace this directory with a symlink.
       if [ ! -L /usr/share/doc/@PACKAGE@ ] && [ -d /usr/share/doc/@PACKAGE@ ]; then
         if rmdir /usr/share/doc/@PACKAGE@ 2>/dev/null; then
diff --git a/debian/grub-linuxbios.postinst b/debian/grub-linuxbios.postinst
index d5d90a693..f800f1263 100644
--- a/debian/grub-linuxbios.postinst
+++ b/debian/grub-linuxbios.postinst
@@ -3,11 +3,11 @@ set -e
 
 case "$1" in
   configure)
-    if dpkg --compare-versions "$2" lt-nl 1.99-1; then
+    if dpkg --compare-versions "$2" lt-nl 2.00-6; then
       # Force dpkg to replace this directory with a symlink.
-      if [ ! -L /usr/share/doc/@PACKAGE@ ] && [ -d /usr/share/doc/@PACKAGE@ ]; then
-        if rmdir /usr/share/doc/@PACKAGE@ 2>/dev/null; then
-          ln -sf grub-common /usr/share/doc/@PACKAGE@
+      if [ ! -L /usr/share/doc/grub-linuxbios ] && [ -d /usr/share/doc/grub-linuxbios ]; then
+        if rmdir /usr/share/doc/grub-linuxbios 2>/dev/null; then
+          ln -sf grub-common /usr/share/doc/grub-linuxbios
         fi
       fi
     fi
diff --git a/debian/grub2.postinst b/debian/grub2.postinst
index d5d90a693..321669cb7 100644
--- a/debian/grub2.postinst
+++ b/debian/grub2.postinst
@@ -3,11 +3,11 @@ set -e
 
 case "$1" in
   configure)
-    if dpkg --compare-versions "$2" lt-nl 1.99-1; then
+    if dpkg --compare-versions "$2" lt-nl 2.00-6; then
       # Force dpkg to replace this directory with a symlink.
-      if [ ! -L /usr/share/doc/@PACKAGE@ ] && [ -d /usr/share/doc/@PACKAGE@ ]; then
-        if rmdir /usr/share/doc/@PACKAGE@ 2>/dev/null; then
-          ln -sf grub-common /usr/share/doc/@PACKAGE@
+      if [ ! -L /usr/share/doc/grub2 ] && [ -d /usr/share/doc/grub2 ]; then
+        if rmdir /usr/share/doc/grub2 2>/dev/null; then
+          ln -sf grub-common /usr/share/doc/grub2
         fi
       fi
     fi
diff --git a/debian/rules b/debian/rules
index c9557d472..568a0d86a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -312,6 +312,9 @@ override_dh_strip:
 override_dh_shlibdeps:
 	dh_shlibdeps -X.module
 
+override_dh_builddeb:
+	dh_builddeb -- -Zxz
+
 override_dh_auto_clean:
 	-rm -rf build
 	-rm -f contrib grub-core/contrib