diff --git a/x11/gnome/orca/Makefile b/x11/gnome/orca/Makefile
index 62573873961..e8a7434de00 100644
--- a/x11/gnome/orca/Makefile
+++ b/x11/gnome/orca/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2010/01/04 08:37:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2010/04/23 12:23:32 ajacoutot Exp $
 
 COMMENT=		assistive technology for people with visual impairments
 
-GNOME_VERSION=		2.28.3
+GNOME_VERSION=		2.30.0
 GNOME_PROJECT=		orca
 
 HOMEPAGE=		http://live.gnome.org/Orca
diff --git a/x11/gnome/orca/distinfo b/x11/gnome/orca/distinfo
index ccee3f5fb5f..28b49f0fa76 100644
--- a/x11/gnome/orca/distinfo
+++ b/x11/gnome/orca/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnome/orca-2.28.3.tar.bz2) = YJcFEGTnok3PM1QQ1KAg3A==
-RMD160 (gnome/orca-2.28.3.tar.bz2) = dA5P7wLaI11F7dx3/QsY7IVkQJ0=
-SHA1 (gnome/orca-2.28.3.tar.bz2) = itu4hfpemkx5y4plQ5u7Hy0d5PI=
-SHA256 (gnome/orca-2.28.3.tar.bz2) = +U92u2GK5M52w36Ad7PV6BNQxKyJmiJPpw1eWk1gFOI=
-SIZE (gnome/orca-2.28.3.tar.bz2) = 2173461
+MD5 (gnome/orca-2.30.0.tar.bz2) = UBoOfqkDYujW8fnoqLxlqg==
+RMD160 (gnome/orca-2.30.0.tar.bz2) = 1xXWFac9GgJ2Swc3S6MXU68Akgk=
+SHA1 (gnome/orca-2.30.0.tar.bz2) = GTKd64giTD5jf6Mj+hRgK11PRfg=
+SHA256 (gnome/orca-2.30.0.tar.bz2) = 7r8/r99DqPilXpfpwqhfVzS/Kz48SLpKe2/Ceu5zB/8=
+SIZE (gnome/orca-2.30.0.tar.bz2) = 2251519
diff --git a/x11/gnome/orca/pkg/PLIST b/x11/gnome/orca/pkg/PLIST
index 5129141422a..a54684a13c5 100644
--- a/x11/gnome/orca/pkg/PLIST
+++ b/x11/gnome/orca/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2009/12/21 18:03:19 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.7 2010/04/23 12:23:32 ajacoutot Exp $
 bin/orca
 lib/python${MODPY_VERSION}/site-packages/orca/
 lib/python${MODPY_VERSION}/site-packages/orca/__init__.py
@@ -64,6 +64,9 @@ lib/python${MODPY_VERSION}/site-packages/orca/generator.pyo
 lib/python${MODPY_VERSION}/site-packages/orca/gnomespeechfactory.py
 lib/python${MODPY_VERSION}/site-packages/orca/gnomespeechfactory.pyc
 lib/python${MODPY_VERSION}/site-packages/orca/gnomespeechfactory.pyo
+lib/python${MODPY_VERSION}/site-packages/orca/gsmag.py
+lib/python${MODPY_VERSION}/site-packages/orca/gsmag.pyc
+lib/python${MODPY_VERSION}/site-packages/orca/gsmag.pyo
 lib/python${MODPY_VERSION}/site-packages/orca/httpserver.py
 lib/python${MODPY_VERSION}/site-packages/orca/httpserver.pyc
 lib/python${MODPY_VERSION}/site-packages/orca/httpserver.pyo
@@ -147,6 +150,19 @@ lib/python${MODPY_VERSION}/site-packages/orca/scripts/__init__.py
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/__init__.pyo
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Banshee/
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Banshee/__init__.py
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Banshee/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Banshee/__init__.pyo
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Banshee/formatting.py
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Banshee/formatting.pyc
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Banshee/formatting.pyo
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Banshee/script.py
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Banshee/script.pyc
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Banshee/script.pyo
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Banshee/speech_generator.py
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Banshee/speech_generator.pyc
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Banshee/speech_generator.pyo
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Mozilla.py
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Mozilla.pyc
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/Mozilla.pyo
@@ -270,6 +286,9 @@ lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/packagemanager/braill
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/packagemanager/script.py
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/packagemanager/script.pyc
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/packagemanager/script.pyo
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/packagemanager/script_settings.py
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/packagemanager/script_settings.pyc
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/packagemanager/script_settings.pyo
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/packagemanager/speech_generator.py
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/packagemanager/speech_generator.pyc
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/packagemanager/speech_generator.pyo
@@ -340,9 +359,16 @@ lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/soffice/speech_genera
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/soffice/structural_navigation.py
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/soffice/structural_navigation.pyc
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/soffice/structural_navigation.pyo
-lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/yelp.py
-lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/yelp.pyc
-lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/yelp.pyo
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/yelp/
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/yelp/__init__.py
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/yelp/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/yelp/__init__.pyo
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/yelp/script.py
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/yelp/script.pyc
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/yelp/script.pyo
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/yelp/script_settings.py
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/yelp/script_settings.pyc
+lib/python${MODPY_VERSION}/site-packages/orca/scripts/apps/yelp/script_settings.pyo
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/self_voicing.py
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/self_voicing.pyc
 lib/python${MODPY_VERSION}/site-packages/orca/scripts/self_voicing.pyo