diff --git a/x11/gtk+/Makefile b/x11/gtk+/Makefile
index 7de064264d0..d4d4013ec49 100644
--- a/x11/gtk+/Makefile
+++ b/x11/gtk+/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.72 2010/11/22 08:36:59 espie Exp $
+# $OpenBSD: Makefile,v 1.73 2011/07/17 15:39:50 naddy Exp $
 
 COMMENT=	General Toolkit for X11 GUI
 
 DISTNAME=	gtk+-1.2.10
-REVISION=	9
+REVISION=	10
 
 SHARED_LIBS=	gdk 3.0 \
 		gtk 3.0
diff --git a/x11/gtk+/patches/patch-gdk_gdkinput_c b/x11/gtk+/patches/patch-gdk_gdkinput_c
new file mode 100644
index 00000000000..3f69a578dac
--- /dev/null
+++ b/x11/gtk+/patches/patch-gdk_gdkinput_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-gdk_gdkinput_c,v 1.1 2011/07/17 15:39:50 naddy Exp $
+--- gdk/gdkinput.c.orig	Sun Jul 17 16:45:19 2011
++++ gdk/gdkinput.c	Sun Jul 17 16:45:49 2011
+@@ -25,6 +25,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <string.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include "config.h"
diff --git a/x11/gtk+/patches/patch-gtk_gtktypeutils_h b/x11/gtk+/patches/patch-gtk_gtktypeutils_h
new file mode 100644
index 00000000000..d1814d52356
--- /dev/null
+++ b/x11/gtk+/patches/patch-gtk_gtktypeutils_h
@@ -0,0 +1,15 @@
+$OpenBSD: patch-gtk_gtktypeutils_h,v 1.1 2011/07/17 15:39:50 naddy Exp $
+
+Fix LP64 warnings.
+
+--- gtk/gtktypeutils.h.orig	Sun Jul 17 16:46:12 2011
++++ gtk/gtktypeutils.h	Sun Jul 17 16:46:40 2011
+@@ -86,7 +86,7 @@ typedef enum
+ #ifdef offsetof
+ #define GTK_STRUCT_OFFSET(struct, field)        ((gint) offsetof (struct, field))
+ #else /* !offsetof */
+-#define GTK_STRUCT_OFFSET(struct, field)        ((gint) ((gchar*) &((struct*) 0)->field))
++#define GTK_STRUCT_OFFSET(struct, field)        ((gint) (size_t) ((gchar*) &((struct*) 0)->field))
+ #endif /* !offsetof */
+ 
+