$OpenBSD$
--- frontends/framebuffer/convert_image.c.orig	Sat Nov 19 06:37:41 2016
+++ frontends/framebuffer/convert_image.c	Sat Dec  3 18:08:10 2016
@@ -266,7 +266,7 @@ main(int argc, char **argv)
 	fprintf(f, "#include \"framebuffer/gui.h\"\n");
 	fprintf(f, "#include \"framebuffer/fbtk.h\"\n\n");
 
-	fprintf(f, "static uint8_t %s_pixdata[] = {\n", argv[3]);
+	fprintf(f, "static uint32_t %s_pixdata[] = {\n", argv[3]);
 	for (y = 0; y < HEIGHT; ++y) {
 		unsigned char *rowptr = bitmap_data + (rowstride * y);
 		if (is_cursor) {
@@ -275,10 +275,8 @@ main(int argc, char **argv)
 		}
 		fprintf(f, "\t");
 		for (x = 0; x < WIDTH; ++x) {
-			for (c = 0; c < 4; ++c) {
-				unsigned char b = *rowptr++;
-				fprintf(f, "0x%02x, ", b);
-			}
+			fprintf(f, "0x%02x%02x%02x%02x, ", rowptr[3], rowptr[2], rowptr[1], rowptr[0]);
+			rowptr += 4;
 		}
 		fprintf(f, "\n");
 	}
$OpenBSD$
--- frontends/framebuffer/fbtk.h.orig	Sat Dec  3 18:03:23 2016
+++ frontends/framebuffer/fbtk.h	Sat Dec  3 18:03:25 2016
@@ -69,7 +69,7 @@ typedef struct fbtk_callback_info {
 struct fbtk_bitmap {
         int width;
         int height;
-        uint8_t *pixdata;
+        uint32_t *pixdata;
         bool opaque;
 
         /* The following two are only used for cursors */