diff --git a/devel/xdg-utils/Makefile b/devel/xdg-utils/Makefile
index 0bade0b7e97..eed19f8445d 100644
--- a/devel/xdg-utils/Makefile
+++ b/devel/xdg-utils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2011/03/28 07:12:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2011/05/19 18:35:43 ajacoutot Exp $
 
 # XXX Are we affected by CVE-2008-0386? Our sed(1) does not behave as
 # the GNU version.
@@ -8,7 +8,7 @@ COMMENT=	utilities to assist desktop integration tasks
 DISTNAME=	xdg-utils-1.0.2
 CATEGORIES=	devel
 
-REVISION=	10
+REVISION=	11
 
 HOMEPAGE=	http://portland.freedesktop.org/wiki/
 
diff --git a/devel/xdg-utils/patches/patch-scripts_xdg-email b/devel/xdg-utils/patches/patch-scripts_xdg-email
index 295a46db273..b1b40c4bbcc 100644
--- a/devel/xdg-utils/patches/patch-scripts_xdg-email
+++ b/devel/xdg-utils/patches/patch-scripts_xdg-email
@@ -1,7 +1,30 @@
-$OpenBSD: patch-scripts_xdg-email,v 1.3 2008/11/26 17:49:39 ajacoutot Exp $
+$OpenBSD: patch-scripts_xdg-email,v 1.4 2011/05/19 18:35:43 ajacoutot Exp $
+
+Merge part of:
+From 79fe2261b0025b36515d17d3c22c162bf1c7efb3 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter@math.unl.edu>
+Date: Fri, 16 Oct 2009 17:10:55 +0000
+Subject: * prefer gvfs-open over gnome-open
+
 --- scripts/xdg-email.orig	Sun Jun 24 21:58:04 2007
-+++ scripts/xdg-email	Wed Nov 26 18:45:09 2008
-@@ -480,7 +480,7 @@ result=$(echo "$1" | $utf8 | awk '
++++ scripts/xdg-email	Thu May 19 20:23:55 2011
+@@ -406,8 +406,13 @@ open_kde()
+ 
+ open_gnome()
+ {
+-    DEBUG 1 "Running gnome-open \"$1\""
+-    gnome-open "$1"
++    if gvfs-open --help 2>/dev/null 1>&2; then
++        DEBUG 1 "Running gvfs-open \"$1\"" 
++        gvfs-open "$1"
++    else
++        DEBUG 1 "Running gnome-open \"$1\""
++        gnome-open "$1"
++    fi
+ 
+     if [ $? -eq 0 ]; then
+         exit_success
+@@ -480,7 +485,7 @@ result=$(echo "$1" | $utf8 | awk '
  
  options=
  mailto=
@@ -10,7 +33,7 @@ $OpenBSD: patch-scripts_xdg-email,v 1.3 2008/11/26 17:49:39 ajacoutot Exp $
  while [ $# -gt 0 ] ; do
      parm="$1"
      shift
-@@ -607,12 +607,21 @@ if which xdg-email-hook.sh > /dev/null 2> /dev/null; t
+@@ -607,12 +612,21 @@ if which xdg-email-hook.sh > /dev/null 2> /dev/null; t
      fi
  fi
  
diff --git a/devel/xdg-utils/patches/patch-scripts_xdg-open b/devel/xdg-utils/patches/patch-scripts_xdg-open
index aa63900a4d7..21d2238f8d9 100644
--- a/devel/xdg-utils/patches/patch-scripts_xdg-open
+++ b/devel/xdg-utils/patches/patch-scripts_xdg-open
@@ -1,7 +1,27 @@
-$OpenBSD: patch-scripts_xdg-open,v 1.5 2011/03/28 07:12:05 ajacoutot Exp $
+$OpenBSD: patch-scripts_xdg-open,v 1.6 2011/05/19 18:35:43 ajacoutot Exp $
+
+Merge part of:
+From 79fe2261b0025b36515d17d3c22c162bf1c7efb3 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter@math.unl.edu>
+Date: Fri, 16 Oct 2009 17:10:55 +0000
+Subject: * prefer gvfs-open over gnome-open
+
 --- scripts/xdg-open.orig	Sun Jun 24 21:58:01 2007
-+++ scripts/xdg-open	Mon Mar 28 08:58:36 2011
-@@ -364,7 +364,9 @@ open_generic()
++++ scripts/xdg-open	Thu May 19 20:24:15 2011
+@@ -338,7 +338,11 @@ open_kde()
+ 
+ open_gnome()
+ {
+-    gnome-open "$1"
++    if gvfs-open --help 2>/dev/null 1>&2; then
++        gvfs-open "$1"
++    else
++        gnome-open "$1"
++    fi
+ 
+     if [ $? -eq 0 ]; then
+         exit_success
+@@ -364,7 +368,9 @@ open_generic()
      for browser in $BROWSER; do
          if [ x"$browser" != x"" ]; then
  
@@ -12,7 +32,7 @@ $OpenBSD: patch-scripts_xdg-open,v 1.5 2011/03/28 07:12:05 ajacoutot Exp $
  
              if [ x"$browser_with_arg" = x"$browser" ]; then "$browser" "$1";
              else $browser_with_arg;
-@@ -403,12 +405,21 @@ if [ -z "${url}" ] ; then
+@@ -403,12 +409,21 @@ if [ -z "${url}" ] ; then
      exit_failure_syntax "file or URL argument missing"
  fi