diff --git a/x11/gnome/gok/Makefile b/x11/gnome/gok/Makefile
index cdd1a82f089..f9a879bd2af 100644
--- a/x11/gnome/gok/Makefile
+++ b/x11/gnome/gok/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.27 2010/04/11 16:39:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2010/04/23 16:26:33 ajacoutot Exp $
 
 COMMENT=		GNOME on-screen keyboard
 
 GNOME_PROJECT=		gok
-GNOME_VERSION=		2.28.1
-PKGNAME=		${DISTNAME}p1
+GNOME_VERSION=		2.30.0
 
 HOMEPAGE=		http://live.gnome.org/Gok
 
@@ -23,14 +22,13 @@ WANTLIB += glitz gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
 WANTLIB += ltdl m ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
 WANTLIB += pixman-1 png pthread pthread-stubs startup-notification-1
 WANTLIB += vorbis vorbisfile xcb xcb-atom xcb-aux xcb-event xml2
-WANTLIB += z
+WANTLIB += z xcb-render xcb-render-util
 
 MODULES=	devel/gconf2 \
 		devel/gettext \
 		x11/gnome
 
 LIB_DEPENDS=		canberra-gtk,canberra::audio/libcanberra \
-			glade-2.0::devel/libglade2 \
 			wnck-1::devel/libwnck \
 			cspi,loginhelper,spi::x11/gnome/at-spi \
 			gnomespeech::x11/gnome/speech
@@ -41,7 +39,7 @@ DESKTOP_FILES=		Yes
 MODGCONF2_SCHEMAS_DIR=	gok
 
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--disable-xevie
+			--enable-gtk-doc=no
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
diff --git a/x11/gnome/gok/distinfo b/x11/gnome/gok/distinfo
index 3b335db1741..7a9ff8eb4cf 100644
--- a/x11/gnome/gok/distinfo
+++ b/x11/gnome/gok/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnome/gok-2.28.1.tar.bz2) = 1zBfEscD4T7q7XlvmW28hg==
-RMD160 (gnome/gok-2.28.1.tar.bz2) = 1M+aKhDhwPuH1w8WHh+j7jn3HJs=
-SHA1 (gnome/gok-2.28.1.tar.bz2) = GUCA0sSZMGGvOr1I06KhQ5PO8cQ=
-SHA256 (gnome/gok-2.28.1.tar.bz2) = Ehq5hgWwmBwTHNxJvxkLqB6anVxyD6lO0vsxk/Eh6QQ=
-SIZE (gnome/gok-2.28.1.tar.bz2) = 1588038
+MD5 (gnome/gok-2.30.0.tar.bz2) = hTx4Jeti18Ql9aDv3AdBKg==
+RMD160 (gnome/gok-2.30.0.tar.bz2) = TH6xvdnmfTKHrTbGYkZXsYf5zF0=
+SHA1 (gnome/gok-2.30.0.tar.bz2) = VkrX8vfSQdmfR6u0LwEq6aIGPVE=
+SHA256 (gnome/gok-2.30.0.tar.bz2) = b+bhFtxmPX8hMrRPyZWc4umiblJZ7qhg22gpxzajhrY=
+SIZE (gnome/gok-2.30.0.tar.bz2) = 1544165
diff --git a/x11/gnome/gok/pkg/PLIST b/x11/gnome/gok/pkg/PLIST
index a49ce02dffd..6ad7c1afe31 100644
--- a/x11/gnome/gok/pkg/PLIST
+++ b/x11/gnome/gok/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.9 2009/12/21 18:14:31 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.10 2010/04/23 16:26:34 ajacoutot Exp $
 @bin bin/create-branching-keyboard
 @bin bin/gok
 lib/bonobo/
@@ -224,6 +224,17 @@ share/gok/el/quit.kbd
 share/gok/el/text-operations.kbd
 share/gok/el/valuator.kbd
 share/gok/empty.png
+share/gok/en@shaw/
+share/gok/en@shaw/gok-controls.kbd
+share/gok/en@shaw/hide.kbd
+share/gok/en@shaw/launcher.kbd
+share/gok/en@shaw/main.kbd
+share/gok/en@shaw/mouse.kbd
+share/gok/en@shaw/move-resize.kbd
+share/gok/en@shaw/numberpad.kbd
+share/gok/en@shaw/quit.kbd
+share/gok/en@shaw/text-operations.kbd
+share/gok/en@shaw/valuator.kbd
 share/gok/en_CA/
 share/gok/en_CA/gok-controls.kbd
 share/gok/en_CA/hide.kbd
@@ -334,8 +345,8 @@ share/gok/gl/numberpad.kbd
 share/gok/gl/quit.kbd
 share/gok/gl/text-operations.kbd
 share/gok/gl/valuator.kbd
-share/gok/glade/
-share/gok/glade/gok.glade2
+share/gok/gok-editor.ui
+share/gok/gok-settingsdialog.ui
 share/gok/gok.rc
 share/gok/goklogo.png
 share/gok/gu/
@@ -896,7 +907,6 @@ share/gtk-doc/html/gok/ch01.html
 share/gtk-doc/html/gok/ch02.html
 share/gtk-doc/html/gok/ch03.html
 share/gtk-doc/html/gok/ch04.html
-share/gtk-doc/html/gok/gok-GokButton.html
 share/gtk-doc/html/gok/gok-arraylist.html
 share/gtk-doc/html/gok/gok-callbacks.html
 share/gtk-doc/html/gok/gok-command-common.html
@@ -909,6 +919,7 @@ share/gtk-doc/html/gok/gok-command-vertex.html
 share/gtk-doc/html/gok/gok-global.html
 share/gtk-doc/html/gok/gok-gok-action.html
 share/gtk-doc/html/gok/gok-gok-branchback-stack.html
+share/gtk-doc/html/gok/gok-gok-button.html
 share/gtk-doc/html/gok/gok-gok-chunker.html
 share/gtk-doc/html/gok/gok-gok-control.html
 share/gtk-doc/html/gok/gok-gok-data.html
@@ -974,6 +985,7 @@ share/locale/da/LC_MESSAGES/gok.mo
 share/locale/de/LC_MESSAGES/gok.mo
 share/locale/dz/LC_MESSAGES/gok.mo
 share/locale/el/LC_MESSAGES/gok.mo
+share/locale/en@shaw/LC_MESSAGES/gok.mo
 share/locale/en_CA/LC_MESSAGES/gok.mo
 share/locale/en_GB/LC_MESSAGES/gok.mo
 share/locale/es/LC_MESSAGES/gok.mo