diff --git a/sys/arch/dreamcast/dev/pvr.c b/sys/arch/dreamcast/dev/pvr.c
index 7eb7505fbd98..6647a2bf9bf0 100644
--- a/sys/arch/dreamcast/dev/pvr.c
+++ b/sys/arch/dreamcast/dev/pvr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pvr.c,v 1.33 2011/07/19 15:52:29 dyoung Exp $	*/
+/*	$NetBSD: pvr.c,v 1.34 2012/01/11 21:17:33 macallan Exp $	*/
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.33 2011/07/19 15:52:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.34 2012/01/11 21:17:33 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -237,10 +237,10 @@ pvr_getdevconfig(struct fb_devconfig *dc)
 	wsfont_init();
 	/* prefer 8 pixel wide font */
 	cookie = wsfont_find(NULL, 8, 0, 0, WSDISPLAY_FONTORDER_L2R,
-	    WSDISPLAY_FONTORDER_L2R);
+	    WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
 	if (cookie <= 0)
 		cookie = wsfont_find(NULL, 0, 0, 0, WSDISPLAY_FONTORDER_L2R,
-		    WSDISPLAY_FONTORDER_L2R);
+		    WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
 	if (cookie <= 0) {
 		printf("pvr: font table is empty\n");
 		return;
diff --git a/sys/arch/ews4800mips/sbd/fb_sbdio.c b/sys/arch/ews4800mips/sbd/fb_sbdio.c
index 196c52f501ff..16fdaac74c33 100644
--- a/sys/arch/ews4800mips/sbd/fb_sbdio.c
+++ b/sys/arch/ews4800mips/sbd/fb_sbdio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fb_sbdio.c,v 1.11 2010/05/15 16:35:37 tsutsui Exp $	*/
+/*	$NetBSD: fb_sbdio.c,v 1.12 2012/01/11 21:17:33 macallan Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #define WIRED_FB_TLB
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.11 2010/05/15 16:35:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.12 2012/01/11 21:17:33 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -214,9 +214,9 @@ fb_common_init(struct rasops_info *ri, struct ga *ga)
 
 	wsfont_init();
 	/* prefer 12 pixel wide font */
-	cookie = wsfont_find(NULL, 12, 0, 0, 0, 0);
+	cookie = wsfont_find(NULL, 12, 0, 0, 0, 0, WSFONT_FIND_BITMAP);
 	if (cookie <= 0)
-		cookie = wsfont_find(NULL, 0, 0, 0, 0, 0);
+		cookie = wsfont_find(NULL, 0, 0, 0, 0, 0, WSFONT_FIND_BITMAP);
 	if (cookie <= 0) {
 		printf("sfb: font table is empty\n");
 		return;
diff --git a/sys/arch/pmax/ibus/pm.c b/sys/arch/pmax/ibus/pm.c
index d9e625a95cff..467c6e29a1ac 100644
--- a/sys/arch/pmax/ibus/pm.c
+++ b/sys/arch/pmax/ibus/pm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pm.c,v 1.10 2011/07/09 17:32:30 matt Exp $	*/
+/*	$NetBSD: pm.c,v 1.11 2012/01/11 21:17:33 macallan Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.10 2011/07/09 17:32:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.11 2012/01/11 21:17:33 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -266,13 +266,13 @@ pm_common_init(void)
 	wsfont_init();
 	if (ri->ri_depth == 8)
 		cookie = wsfont_find(NULL, 12, 0, 0, bior,
-		    WSDISPLAY_FONTORDER_L2R);
+		    WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
 	else
 		cookie = wsfont_find(NULL, 8, 0, 0, bior,
-		    WSDISPLAY_FONTORDER_L2R);
+		    WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
 	if (cookie <= 0)
 		cookie = wsfont_find(NULL, 0, 0, 0, bior,
-		    WSDISPLAY_FONTORDER_L2R);
+		    WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
 	if (cookie <= 0) {
 		printf("pm: font table is empty\n");
 		return;