diff --git a/sys/dev/fb/boot_font.c b/sys/dev/fb/boot_font.c
index b8921687623..b1cc5f08a81 100644
--- a/sys/dev/fb/boot_font.c
+++ b/sys/dev/fb/boot_font.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/fb/gfb.h>
 
-struct gfb_font bold8x16 = {
+const struct gfb_font bold8x16 = {
 	8,
 	16,
 	{
diff --git a/sys/dev/fb/gfb.h b/sys/dev/fb/gfb.h
index 85ace52ce6f..ee70640b8a5 100644
--- a/sys/dev/fb/gfb.h
+++ b/sys/dev/fb/gfb.h
@@ -35,7 +35,7 @@
 struct gfb_font {
 	int width;
 	int height;
-	u_char data[256 * 32];
+	const u_char data[];
 };
 
 #endif /* _FB_GFB_H_ */
diff --git a/sys/i386/xbox/xboxfb.c b/sys/i386/xbox/xboxfb.c
index 57fffe6c8da..fa9decb4b4e 100644
--- a/sys/i386/xbox/xboxfb.c
+++ b/sys/i386/xbox/xboxfb.c
@@ -23,10 +23,11 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * This is the syscon(4)-ized version of the Xbox Frame Buffer driver. It
  * supports about all features required, such as mouse support.
@@ -71,7 +72,7 @@ struct xboxfb_softc {
 	char* sc_framebuffer;
 
 	/* pointer to the font used */
-	struct gfb_font* sc_font;
+	const struct gfb_font* sc_font;
 };
 
 #define SCREEN_WIDTH	640
@@ -79,7 +80,7 @@ struct xboxfb_softc {
 
 #define XBOXFB_DRIVER_NAME "xboxsc"
 
-extern struct gfb_font bold8x16;
+extern const struct gfb_font bold8x16;
 
 static vi_probe_t xboxfb_probe;
 static vi_init_t xboxfb_init;
@@ -593,7 +594,7 @@ xboxfb_putc(video_adapter_t *adp, vm_offset_t off, u_int8_t c, u_int8_t a)
 	int i, j;
 	struct xboxfb_softc* sc = &xboxfb_sc;
 	uint32_t* ptri = (uint32_t*)sc->sc_framebuffer;
-	uint8_t* fontdata;
+	const uint8_t* fontdata;
 	uint32_t clr;
 	uint8_t mask;