diff --git a/x11/matchbox/matchbox-keyboard/Makefile b/x11/matchbox/matchbox-keyboard/Makefile
index ca955ae1953..0f84c14ac10 100644
--- a/x11/matchbox/matchbox-keyboard/Makefile
+++ b/x11/matchbox/matchbox-keyboard/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.13 2010/07/30 12:03:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2010/09/03 16:06:23 sthen Exp $
 
 COMMENT=	on-screen virtual keyboard
 DISTNAME=	matchbox-keyboard-0.1
-REVISION=	5
+REVISION=	6
 
 MASTER_SITES=	${MASTER_SITES_MATCHBOX:=matchbox-keyboard/0.1/}
 
diff --git a/x11/matchbox/matchbox-keyboard/patches/patch-src_matchbox-keyboard-layout_c b/x11/matchbox/matchbox-keyboard/patches/patch-src_matchbox-keyboard-layout_c
new file mode 100644
index 00000000000..b365e761328
--- /dev/null
+++ b/x11/matchbox/matchbox-keyboard/patches/patch-src_matchbox-keyboard-layout_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_matchbox-keyboard-layout_c,v 1.1 2010/09/03 16:06:23 sthen Exp $
+--- src/matchbox-keyboard-layout.c.orig	Fri Sep  3 17:01:59 2010
++++ src/matchbox-keyboard-layout.c	Fri Sep  3 17:02:09 2010
+@@ -44,7 +44,7 @@ void
+ mb_kbd_layout_append_row(MBKeyboardLayout *layout,
+ 			 MBKeyboardRow    *row)
+ {
+-  layout->rows = util_list_append(layout->rows, (pointer)row);
++  layout->rows = util_list_append(layout->rows, (mb_pointer)row);
+ }
+ 
+ List*
diff --git a/x11/matchbox/matchbox-keyboard/patches/patch-src_matchbox-keyboard-row_c b/x11/matchbox/matchbox-keyboard/patches/patch-src_matchbox-keyboard-row_c
new file mode 100644
index 00000000000..6149a84088b
--- /dev/null
+++ b/x11/matchbox/matchbox-keyboard/patches/patch-src_matchbox-keyboard-row_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_matchbox-keyboard-row_c,v 1.1 2010/09/03 16:06:23 sthen Exp $
+--- src/matchbox-keyboard-row.c.orig	Fri Sep  3 17:01:59 2010
++++ src/matchbox-keyboard-row.c	Fri Sep  3 17:02:12 2010
+@@ -138,7 +138,7 @@ mb_kbd_row_base_width(MBKeyboardRow *row) 
+ void
+ mb_kbd_row_append_key(MBKeyboardRow *row, MBKeyboardKey *key)
+ {
+-  row->keys = util_list_append(row->keys, (pointer)key);
++  row->keys = util_list_append(row->keys, (mb_pointer)key);
+ 
+   mb_kbd_key_set_row(key, row);
+ }
diff --git a/x11/matchbox/matchbox-keyboard/patches/patch-src_matchbox-keyboard_c b/x11/matchbox/matchbox-keyboard/patches/patch-src_matchbox-keyboard_c
new file mode 100644
index 00000000000..d778bce442c
--- /dev/null
+++ b/x11/matchbox/matchbox-keyboard/patches/patch-src_matchbox-keyboard_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_matchbox-keyboard_c,v 1.1 2010/09/03 16:06:23 sthen Exp $
+--- src/matchbox-keyboard.c.orig	Fri Sep  3 17:01:35 2010
++++ src/matchbox-keyboard.c	Fri Sep  3 17:02:14 2010
+@@ -234,7 +234,7 @@ mb_kbd_locate_key(MBKeyboard *kb, int x, int y)
+ void
+ mb_kbd_add_layout(MBKeyboard *kb, MBKeyboardLayout *layout)
+ {
+-  kb->layouts = util_list_append(kb->layouts, (pointer)layout);
++  kb->layouts = util_list_append(kb->layouts, (mb_pointer)layout);
+ }
+ 
+ MBKeyboardLayout*
diff --git a/x11/matchbox/matchbox-keyboard/patches/patch-src_matchbox-keyboard_h b/x11/matchbox/matchbox-keyboard/patches/patch-src_matchbox-keyboard_h
new file mode 100644
index 00000000000..5d1b3020a7e
--- /dev/null
+++ b/x11/matchbox/matchbox-keyboard/patches/patch-src_matchbox-keyboard_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_matchbox-keyboard_h,v 1.1 2010/09/03 16:06:23 sthen Exp $
+--- src/matchbox-keyboard.h.orig	Fri Sep  3 17:01:32 2010
++++ src/matchbox-keyboard.h	Fri Sep  3 17:02:17 2010
+@@ -55,7 +55,7 @@
+ 
+ #define MARK() DBG("mark")
+ 
+-typedef void*         pointer;
++typedef void*         mb_pointer;
+ typedef unsigned char uchar ;
+ typedef Bool          boolean ;
+