diff --git a/Makefile b/Makefile
index 6e1fca6..520d4f7 100644
--- a/Makefile
+++ b/Makefile
@@ -74,17 +74,16 @@ bedstead-chiseltip.sfd: strokefont.py bedstead-oc.sfd
 	fontforge -lang=py -script strokefont.py chiseltip bedstead-oc.sfd \
 		bedstead-chiseltip.sfd
 
-bedstead-10.bdf.ps: bedstead
-	./bedstead --bdfgen > bedstead-10.bdf.ps
+bedstead-%.bdf.ps: bedstead
+	./bedstead --bdfgen $* > $@
 
-bedstead-10.bdf: bedstead-10.bdf.ps
-	gs -q -P -dSAFER -dNODISPLAY -dBATCH bedstead-10.bdf.ps \
-		> bedstead-10.bdf
+bedstead-bold-%.bdf.ps: bedstead
+	./bedstead --bold --bdfgen $* > $@
 
-%-10.bdf %-20.bdf: %.sfd
-	fontforge -lang=ff \
-	    -c 'Open($$1); BitmapsAvail([10, 20]); Generate($$2, "bdf")' \
-	    $< $*.
+# Dependency of all of OTFFILES could be narrowed to just the relevant
+# one.
+%.bdf: %.bdf.ps $(OTFFILES)
+	gs -q -P -dSAFER -dNODISPLAY -dBATCH $< > $@
 
 %.otf: %.sfd
 	fontforge -lang=ff \
@@ -108,7 +107,8 @@ bedstead-complement.pdf: bedstead-complement.ps bedstead.otf Fontmap
 
 .PHONY: clean
 clean:
-	rm -f bedstead *.sfd *.otf *.bdf *.png *.pdf bedstead-complement.ps
+	rm -f bedstead *.sfd *.otf *.bdf *.bdf.ps *.png *.pdf \
+		bedstead-complement.ps
 
 .PHONY: install-user
 install-user: $(OTFFILES)