diff --git a/dia-glib-2.31.patch b/dia-glib-2.31.patch
new file mode 100644
index 0000000..cd6cca0
--- /dev/null
+++ b/dia-glib-2.31.patch
@@ -0,0 +1,52 @@
+Index: dia-0.97.1/objects/custom/shape_typeinfo.c
+===================================================================
+--- dia-0.97.1.orig/objects/custom/shape_typeinfo.c
++++ dia-0.97.1/objects/custom/shape_typeinfo.c
+@@ -27,7 +27,7 @@
+ #include "custom_util.h"
+ #include <string.h>
+ #include <stdarg.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <glib/gstdio.h>
+ #include <libxml/parser.h>
+ 
+Index: dia-0.97.1/plug-ins/pgf/render_pgf.c
+===================================================================
+--- dia-0.97.1.orig/plug-ins/pgf/render_pgf.c
++++ dia-0.97.1/plug-ins/pgf/render_pgf.c
+@@ -61,7 +61,7 @@ TODO:
+ #endif
+ #include <errno.h>
+ 
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <glib/gstdio.h>
+ 
+ #include "intl.h"
+Index: dia-0.97.1/tests/test-boundingbox.c
+===================================================================
+--- dia-0.97.1.orig/tests/test-boundingbox.c
++++ dia-0.97.1/tests/test-boundingbox.c
+@@ -28,7 +28,7 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ 
+-#if GLIB_CHECK_VERSION(2,16,0)
++#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
+ #include <glib/gtestutils.h>
+ #endif
+ #include "dialib.h"
+Index: dia-0.97.1/tests/test-objects.c
+===================================================================
+--- dia-0.97.1.orig/tests/test-objects.c
++++ dia-0.97.1/tests/test-objects.c
+@@ -28,7 +28,7 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ 
+-#if GLIB_CHECK_VERSION(2,16,0)
++#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
+ #include <glib/gtestutils.h>
+ #endif
+ 
diff --git a/dia.changes b/dia.changes
index e31df65..c0b3e77 100644
--- a/dia.changes
+++ b/dia.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec  1 21:09:34 UTC 2011 - dimstar@opensuse.org
+
+- Add dia-glib-2.31.patch: Fix build with glib 2.31.
+
 -------------------------------------------------------------------
 Fri Sep 30 20:07:54 UTC 2011 - coolo@suse.com
 
diff --git a/dia.spec b/dia.spec
index ed851cd..ce6acc0 100644
--- a/dia.spec
+++ b/dia.spec
@@ -57,6 +57,8 @@ Patch14:        dia-python-acinclude.patch
 Patch17:        dia-remove-datetime.patch
 # PATCH-FIX-UPSTREAM dia-swig-2x.patch bgo#651127 idoenmez@suse.de -- Support swig 2.x
 Patch18:        dia-swig-2x.patch
+# PATCH-FIX-UPSTREAM dia-glib-2.31.patch bgo#655335 dimstar@opensuse.org -- Fix build with glib 2.31.
+Patch19:        dia-glib-2.31.patch
 Url:            http://live.gnome.org/Dia
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Recommends:     %{name}-lang
@@ -82,6 +84,7 @@ translation-update-upstream
 %patch14
 %patch17 -p1
 %patch18
+%patch19 -p1
 cp $RPM_SOURCE_DIR/font-test*dia .
 
 %build