diff --git a/x11/gnome/session/Makefile b/x11/gnome/session/Makefile
index 828f8b6621a..45629e0acac 100644
--- a/x11/gnome/session/Makefile
+++ b/x11/gnome/session/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.89 2009/10/22 16:47:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.90 2009/11/12 00:22:55 jasper Exp $
 
 COMMENT=		GNOME session
 
 GNOME_PROJECT=		gnome-session
 GNOME_VERSION=		2.28.0
-PKGNAME=		${DISTNAME}p2
+PKGNAME=		${DISTNAME}p3
 
 CATEGORIES=		x11
 
diff --git a/x11/gnome/session/patches/patch-gnome-session_gsm-dbus-client_c b/x11/gnome/session/patches/patch-gnome-session_gsm-dbus-client_c
new file mode 100644
index 00000000000..2b31f2324d4
--- /dev/null
+++ b/x11/gnome/session/patches/patch-gnome-session_gsm-dbus-client_c
@@ -0,0 +1,22 @@
+$OpenBSD: patch-gnome-session_gsm-dbus-client_c,v 1.1 2009/11/12 00:22:55 jasper Exp $
+
+dbus_message_get_path() can return NULL
+
+--- gnome-session/gsm-dbus-client.c.orig	Thu Nov 12 01:17:12 2009
++++ gnome-session/gsm-dbus-client.c	Thu Nov 12 01:17:51 2009
+@@ -213,10 +213,11 @@ client_dbus_filter_function (DBusConnection *connectio
+ 
+         path = dbus_message_get_path (message);
+ 
+-        g_debug ("GsmDBusClient: obj_path=%s interface=%s method=%s",
+-                 dbus_message_get_path (message),
+-                 dbus_message_get_interface (message),
+-                 dbus_message_get_member (message));
++	if (path != NULL)
++	        g_debug ("GsmDBusClient: obj_path=%s interface=%s method=%s",
++	                 dbus_message_get_path (message),
++	                 dbus_message_get_interface (message),
++	                 dbus_message_get_member (message));
+ 
+         if (dbus_message_is_method_call (message, SM_DBUS_CLIENT_PRIVATE_INTERFACE, "EndSessionResponse")) {
+                 g_assert (gsm_client_peek_id (GSM_CLIENT (client)) != NULL);