diff --git a/x11/gnome/orca/Makefile b/x11/gnome/orca/Makefile
index 3474b812875..dafae3c874b 100644
--- a/x11/gnome/orca/Makefile
+++ b/x11/gnome/orca/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2009/03/04 19:59:42 jasper Exp $
+# $OpenBSD: Makefile,v 1.9 2009/03/19 12:04:39 ajacoutot Exp $
 
 COMMENT=		assistive technology for people with visual impairments
 
 GNOME_VERSION=		2.24.4
 GNOME_PROJECT=		orca
+PKGNAME=		${DISTNAME}p0
 
 HOMEPAGE=		http://live.gnome.org/Orca
 
@@ -22,7 +23,8 @@ MODULES=		devel/gettext \
 BUILD_DEPENDS=		${RUN_DEPENDS}
 RUN_DEPENDS=		::x11/gnome/py-gnome \
 			::x11/gnome/mag \
-			::x11/gnome/speech
+			::x11/gnome/speech \
+			::x11/dbus-python
 
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
diff --git a/x11/gnome/orca/patches/patch-src_orca_orca_in b/x11/gnome/orca/patches/patch-src_orca_orca_in
index c16d770c9b0..cf0e5830f19 100644
--- a/x11/gnome/orca/patches/patch-src_orca_orca_in
+++ b/x11/gnome/orca/patches/patch-src_orca_orca_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_orca_orca_in,v 1.2 2008/11/21 19:05:30 jasper Exp $
---- src/orca/orca.in.orig	Tue Nov 18 13:08:42 2008
-+++ src/orca/orca.in	Tue Nov 18 13:12:43 2008
+$OpenBSD: patch-src_orca_orca_in,v 1.3 2009/03/19 12:04:39 ajacoutot Exp $
+--- src/orca/orca.in.orig	Fri Jan 23 22:35:24 2009
++++ src/orca/orca.in	Thu Mar 19 12:12:37 2009
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -18,12 +18,21 @@ $OpenBSD: patch-src_orca_orca_in,v 1.2 2008/11/21 19:05:30 jasper Exp $
  # Save the arguments away.
  #
  ARGS="$*"
+@@ -83,7 +79,7 @@ restoreXmodmap()
+ cleanup()
+ {
+     USERID=`id | cut -f2 -d= | cut -f1 -d\(`
+-    PIDS=`ps -eo pid,ruid,args | grep $USERID | \
++    PIDS=`ps -xo pid,ruid,args | grep $USERID | \
+ 	egrep "orca[.]orca|OAFIID[:]GNOME_Speech|OAFIID[:]GNOME_Magnifier|festival [-][-]server"|\
+ 	grep -v grep | awk '{ print $1 }'`
+     IFS='
 @@ -137,7 +133,7 @@ if [ "x$LOGNAME" != "xgdm" ] ; then
      fi
  fi
  
 -if [ `grep -c "\-q" <<< $ARGS` -gt 0 ] ; then
-+if [ `echo $ARGS | grep -c "\-q"` -gt 0 ]
++if [ `echo $ARGS | grep -c "\-q"` -gt 0 ] ; then
      # If the user has done -q or --quit, that means to tell any
      # existing orca process to quit.  So, we just do a cleanup.
      #
@@ -32,7 +41,7 @@ $OpenBSD: patch-src_orca_orca_in,v 1.2 2008/11/21 19:05:30 jasper Exp $
          CLEANUP=1
      else
 -        CLEANUP=`egrep -c "\-s|\-t|\-n|\-u|\-e|\-d" <<< $ARGS`
-+        CLEANUP=`echo $ARGS | egrep -c "\-s|\-t|\-n|\-u|\-e|\-d"" <<< $ARGS`
++        CLEANUP=`echo $ARGS egrep -c "\-s|\-t|\-n|\-u|\-e|\-d"`
      fi
  
      # Clean up before running orca to get anything that might