diff --git a/README.font.md b/README.font.md
deleted file mode 100644
index b6dfabbd..00000000
--- a/README.font.md
+++ /dev/null
@@ -1,31 +0,0 @@
-Subiquity comes with its own console font, which differs from the
-standard one in how arrow-like glyphs are rendered; the standard font
-renders them as arrowheaded forms like → but we want solid triangles
-like ▶.
-
-I built the font like this:
-
-
-```
-$ apt source console-setup
-$ cd console-setup-*/Fonts
-$ cat > my.equivalents <<EOF
-U+2191 U+25B4 U+25B2
-# U+2191:   UPWARDS ARROW
-# U+25B4:   BLACK UP-POINTING SMALL TRIANGLE
-# U+25B2:   BLACK UP-POINTING TRIANGLE
-U+2193 U+25BE U+25BC
-# U+2193:   DOWNWARDS ARROW
-# U+25BE:   BLACK DOWN-POINTING SMALL TRIANGLE
-# U+25BC:   BLACK DOWN-POINTING TRIANGLE
-U+2190 U+25C2 U+25C0
-# U+2190:   LEFTWARDS ARROW
-# U+25C2:   BLACK LEFT-POINTING SMALL TRIANGLE
-# U+25C0:   BLACK LEFT-POINTING TRIANGLE
-U+2192 U+25B8 U+25B6
-# U+2192:   RIGHTWARDS ARROW
-# U+25B8:   BLACK RIGHT-POINTING SMALL TRIANGLE
-# U+25B6:   BLACK RIGHT-POINTING TRIANGLE
-EOF
-$ ./bdf2psf --log ./my.log  ./bdf/georgian16.bdf+./bdf/unifont.bdf+./bdf/h16.bdf+./bdf/etl16-unicode.bdf  ./standard.equivalents+./my.equivalents  ./ascii.set+./linux.set+./fontsets/Uni2.512+:./useful.set 512 ./subiquity.psf
-```
diff --git a/font/README.md b/font/README.md
new file mode 100644
index 00000000..2b5e159a
--- /dev/null
+++ b/font/README.md
@@ -0,0 +1,9 @@
+Subiquity comes with its own console font, which differs from the
+standard one in how arrow-like glyphs are rendered; the standard font
+renders them as arrowheaded forms like → but we want solid triangles
+like ▶.
+
+We also want a check mark (✓) and I don't like the one in h16.bdf.
+
+Make the font using the `make-font.sh` script (can't do it at snap
+build time because it uses "apt source").
diff --git a/font/make-font.sh b/font/make-font.sh
new file mode 100755
index 00000000..50eef3e8
--- /dev/null
+++ b/font/make-font.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -eux
+SUBIQUITY_FONT_DIR=$(realpath $(dirname $0))
+tmp=$(mktemp -d)
+cleanup () {
+    rm -rf $tmp
+}
+trap cleanup EXIT
+apt source console-setup
+cd console-setup-*/Fonts
+./bdf2psf \
+    --log ${SUBIQUITY_FONT_DIR}/subiquity.log \
+    ${SUBIQUITY_FONT_DIR}/subiquity.bdf+./bdf/georgian16.bdf+./bdf/unifont.bdf+./bdf/h16.bdf+./bdf/etl16-unicode.bdf \
+    ${SUBIQUITY_FONT_DIR}/subiquity.equivalents+./standard.equivalents \
+    ${SUBIQUITY_FONT_DIR}/subiquity.set+./ascii.set+./linux.set+./fontsets/Uni2.512+:./useful.set \
+    512 \
+    ${SUBIQUITY_FONT_DIR}/subiquity.psf
+
diff --git a/font/subiquity.bdf b/font/subiquity.bdf
new file mode 100644
index 00000000..533644cf
--- /dev/null
+++ b/font/subiquity.bdf
@@ -0,0 +1,32 @@
+STARTFONT 2.1
+FONT -gbdfed-Unknown-Medium-R-Normal--16-120-96-96-P-100-FontSpecific-0
+SIZE 16 75 75
+FONTBOUNDINGBOX 8 14 0 -1
+STARTPROPERTIES 8
+POINT_SIZE 160
+PIXEL_SIZE 16
+RESOLUTION_X 75
+RESOLUTION_Y 75
+FONT_ASCENT 14
+FONT_DESCENT 2
+AVERAGE_WIDTH 80
+_GBDFED_INFO "Edited with gbdfed 1.6."
+ENDPROPERTIES
+CHARS 1
+STARTCHAR U+2713
+ENCODING 10003
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 8 9 0 0
+BITMAP
+01
+03
+06
+CC
+48
+78
+30
+30
+20
+ENDCHAR
+ENDFONT
diff --git a/font/subiquity.equivalents b/font/subiquity.equivalents
new file mode 100644
index 00000000..e0648951
--- /dev/null
+++ b/font/subiquity.equivalents
@@ -0,0 +1,16 @@
+U+2191 U+25B4 U+25B2
+# U+2191:   UPWARDS ARROW
+# U+25B4:   BLACK UP-POINTING SMALL TRIANGLE
+# U+25B2:   BLACK UP-POINTING TRIANGLE
+U+2193 U+25BE U+25BC
+# U+2193:   DOWNWARDS ARROW
+# U+25BE:   BLACK DOWN-POINTING SMALL TRIANGLE
+# U+25BC:   BLACK DOWN-POINTING TRIANGLE
+U+2190 U+25C2 U+25C0
+# U+2190:   LEFTWARDS ARROW
+# U+25C2:   BLACK LEFT-POINTING SMALL TRIANGLE
+# U+25C0:   BLACK LEFT-POINTING TRIANGLE
+U+2192 U+25B8 U+25B6
+# U+2192:   RIGHTWARDS ARROW
+# U+25B8:   BLACK RIGHT-POINTING SMALL TRIANGLE
+# U+25B6:   BLACK RIGHT-POINTING TRIANGLE
diff --git a/subiquity.psf b/font/subiquity.psf
similarity index 60%
rename from subiquity.psf
rename to font/subiquity.psf
index 6b6368c7..4c7ab9b9 100644
Binary files a/subiquity.psf and b/font/subiquity.psf differ
diff --git a/font/subiquity.set b/font/subiquity.set
new file mode 100644
index 00000000..7445b4b4
--- /dev/null
+++ b/font/subiquity.set
@@ -0,0 +1,2 @@
+U+2713
+# U+2713:   CHECK MARK
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 1540ebd5..d2192ef2 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -85,6 +85,8 @@ parts:
       - kbdnames.txt
   font:
     plugin: dump
+    organize:
+      font/subiquity.psf: subiquity.psf
     stage:
       - subiquity.psf
   probert: