diff --git a/16x16.fnt b/16x16.fnt
index ed53725..44ba1c1 100644
Binary files a/16x16.fnt and b/16x16.fnt differ
diff --git a/Makefile b/Makefile
index 7f3983a..886ed20 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,9 @@ endif
 # TODO cjwatson 2007-08-07: this doesn't quite work as it stands at the
 # moment; you need to build the BDF version of unifont and use that.
 font:
+	@if [ -z "$(DI_PATH)" ]; then echo "Please set DI_PATH to an unpacked debian-installer source tree" >&2; exit 1; fi
 	cat po/*.po >tmp.txt
+	cat $(DI_PATH)/build/boot/x86/po/*.po >>tmp.txt
 	mkblfont -v -l 18 -p /usr/share/fonts/X11/misc \
 	-c ISO-8859-15 -c ISO-8859-2 -c koi8-r \
 	`$(KEYMAPCHARS) keytables.inc` \
diff --git a/debian/changelog b/debian/changelog
index b21cef0..374027d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ gfxboot-theme-ubuntu (0.5.6) UNRELEASED; urgency=low
 
   * Rebuild font with unifont 1:1.0-4ubuntu3 (thanks, Liu Qishuai;
     LP: #62849).
+  * Include .po files from debian-installer in corpus used to build reduced
+    font (LP: #106074, #195451).
 
  -- Colin Watson <cjwatson@ubuntu.com>  Fri, 29 Feb 2008 17:48:18 +0000