diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index ee0f37742a7..11f92d85518 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.87 2012/04/23 18:50:36 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.88 2012/04/27 09:59:05 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT=	technical diagrams drawing tool
 
 GNOME_PROJECT=	dia
 GNOME_VERSION=	0.97.2
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	graphics
 
diff --git a/graphics/dia/patches/patch-objects_custom_shape_typeinfo_c b/graphics/dia/patches/patch-objects_custom_shape_typeinfo_c
index 9c728e466a6..76fe0b2107f 100644
--- a/graphics/dia/patches/patch-objects_custom_shape_typeinfo_c
+++ b/graphics/dia/patches/patch-objects_custom_shape_typeinfo_c
@@ -1,16 +1,18 @@
-$OpenBSD: patch-objects_custom_shape_typeinfo_c,v 1.1 2012/03/23 13:28:25 ajacoutot Exp $
+$OpenBSD: patch-objects_custom_shape_typeinfo_c,v 1.2 2012/04/27 09:59:05 ajacoutot Exp $
 
-error: #error "Only <glib.h> can be included directly."
+From f4c743e2ef079bfe288d37d9056a8827c684d01e Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Thu, 01 Dec 2011 21:08:12 +0000
+Subject: Bug 665335: Only #include <glib.h>: the other headers are implicit
 
 --- objects/custom/shape_typeinfo.c.orig	Sat Nov  7 15:28:34 2009
-+++ objects/custom/shape_typeinfo.c	Wed Mar 21 20:59:52 2012
-@@ -27,8 +27,7 @@
++++ objects/custom/shape_typeinfo.c	Fri Apr 27 11:47:46 2012
+@@ -27,7 +27,7 @@
  #include "custom_util.h"
  #include <string.h>
  #include <stdarg.h>
 -#include <glib/gstrfuncs.h>
--#include <glib/gstdio.h>
 +#include <glib.h>
+ #include <glib/gstdio.h>
  #include <libxml/parser.h>
  
- /*
diff --git a/graphics/dia/patches/patch-plug-ins_pgf_render_pgf_c b/graphics/dia/patches/patch-plug-ins_pgf_render_pgf_c
new file mode 100644
index 00000000000..9c1e7a4716e
--- /dev/null
+++ b/graphics/dia/patches/patch-plug-ins_pgf_render_pgf_c
@@ -0,0 +1,18 @@
+$OpenBSD: patch-plug-ins_pgf_render_pgf_c,v 1.1 2012/04/27 09:59:05 ajacoutot Exp $
+
+From f4c743e2ef079bfe288d37d9056a8827c684d01e Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Thu, 01 Dec 2011 21:08:12 +0000
+Subject: Bug 665335: Only #include <glib.h>: the other headers are implicit
+
+--- plug-ins/pgf/render_pgf.c.orig	Fri Apr 27 11:47:07 2012
++++ plug-ins/pgf/render_pgf.c	Fri Apr 27 11:46:58 2012
+@@ -61,7 +61,7 @@ TODO:
+ #endif
+ #include <errno.h>
+ 
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <glib/gstdio.h>
+ 
+ #include "intl.h"
diff --git a/graphics/dia/patches/patch-tests_test-boundingbox_c b/graphics/dia/patches/patch-tests_test-boundingbox_c
index 374426921fa..3833b4fd4de 100644
--- a/graphics/dia/patches/patch-tests_test-boundingbox_c
+++ b/graphics/dia/patches/patch-tests_test-boundingbox_c
@@ -1,6 +1,9 @@
-$OpenBSD: patch-tests_test-boundingbox_c,v 1.1 2012/03/23 13:28:25 ajacoutot Exp $
+$OpenBSD: patch-tests_test-boundingbox_c,v 1.2 2012/04/27 09:59:05 ajacoutot Exp $
 
-error: #error "Only <glib.h> can be included directly."
+From f4c743e2ef079bfe288d37d9056a8827c684d01e Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Thu, 01 Dec 2011 21:08:12 +0000
+Subject: Bug 665335: Only #include <glib.h>: the other headers are implicit
 
 --- tests/test-boundingbox.c.orig	Sat Nov  7 15:28:35 2009
 +++ tests/test-boundingbox.c	Wed Mar 21 20:59:52 2012
diff --git a/graphics/dia/patches/patch-tests_test-objects_c b/graphics/dia/patches/patch-tests_test-objects_c
index 2851e101a6d..34a9e58fee4 100644
--- a/graphics/dia/patches/patch-tests_test-objects_c
+++ b/graphics/dia/patches/patch-tests_test-objects_c
@@ -1,6 +1,9 @@
-$OpenBSD: patch-tests_test-objects_c,v 1.1 2012/03/23 13:28:25 ajacoutot Exp $
+$OpenBSD: patch-tests_test-objects_c,v 1.2 2012/04/27 09:59:05 ajacoutot Exp $
 
-error: #error "Only <glib.h> can be included directly."
+From f4c743e2ef079bfe288d37d9056a8827c684d01e Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Thu, 01 Dec 2011 21:08:12 +0000
+Subject: Bug 665335: Only #include <glib.h>: the other headers are implicit
 
 --- tests/test-objects.c.orig	Sat Nov  7 15:28:35 2009
 +++ tests/test-objects.c	Wed Mar 21 20:59:52 2012