diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 4abc76d3584..1e719302073 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.59 2011/04/05 16:37:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.60 2011/04/07 19:41:32 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -11,7 +11,7 @@ COMMENT=	GNOME web browser based on webkit
 
 GNOME_PROJECT=	epiphany
 GNOME_VERSION=	2.30.6
-REVISION=	1
+REVISION=	2
 
 M=		${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 API_V=		2.29
@@ -44,7 +44,8 @@ WANTLIB += stdc++ tasn1 xcb xcb-atom xcb-aux xcb-event  xcb-render
 WANTLIB += xml2 z GL Xxf86vm drm nssutil3 util xcb-shm
 WANTLIB += xslt>=1 execinfo notify>=2 webkit-1.0>=2.1 soup-gnome-2.4>=1.1
 
-BUILD_DEPENDS=	${RUN_DEPENDS}
+BUILD_DEPENDS=	devel/gobject-introspection \
+		${RUN_DEPENDS}
 RUN_DEPENDS=	x11/gnome/icon-theme \
 		x11/gnome/themes \
 		devel/iso-codes \
@@ -66,7 +67,7 @@ MODGCONF2_SCHEMAS_DIR=  epiphany
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-introspection=no \
+		--enable-introspection \
 		--disable-static \
 		--disable-gtk-doc \
 		--disable-zeroconf \
diff --git a/www/epiphany/patches/patch-src_Makefile_in b/www/epiphany/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..f5e820bae7e
--- /dev/null
+++ b/www/epiphany/patches/patch-src_Makefile_in
@@ -0,0 +1,29 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2011/04/07 19:41:32 jasper Exp $
+
+Correctly set the the symbol/identifier prefix which would otherwise
+cause a warning: "Namespace is empty; likely causes are [...]"
+
+--- src/Makefile.in.orig	Thu Apr  7 21:36:40 2011
++++ src/Makefile.in	Thu Apr  7 21:37:18 2011
+@@ -1585,7 +1585,9 @@ stamp-ephy-dbus-client-bindings.h: $(top_srcdir)/data/
+ @HAVE_INTROSPECTION_TRUE@                                      $(EPHY_GIR_C_FILES) epiphany
+ @HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
+ @HAVE_INTROSPECTION_TRUE@	$(INTROSPECTION_SCANNER) -v \
+-@HAVE_INTROSPECTION_TRUE@		--namespace Epiphany \
++@HAVE_INTROSPECTION_TRUE@		--identifier-prefix=Ephy \
++@HAVE_INTROSPECTION_TRUE@		--symbol-prefix=ephy \
++@HAVE_INTROSPECTION_TRUE@		--namespace=Epiphany \
+ @HAVE_INTROSPECTION_TRUE@		--nsversion=$(EPIPHANY_API_VERSION) \
+ @HAVE_INTROSPECTION_TRUE@		--add-include-path=. \
+ @HAVE_INTROSPECTION_TRUE@		--add-include-path=$(srcdir) \
+@@ -1593,8 +1595,8 @@ stamp-ephy-dbus-client-bindings.h: $(top_srcdir)/data/
+ @HAVE_INTROSPECTION_TRUE@		--include=libxml2-2.0 \
+ @HAVE_INTROSPECTION_TRUE@		--include=WebKit-1.0 \
+ @HAVE_INTROSPECTION_TRUE@		--program=./epiphany \
+-@HAVE_INTROSPECTION_TRUE@		--output $@ \
+-@HAVE_INTROSPECTION_TRUE@		--pkg epiphany-$(EPIPHANY_API_VERSION) \
++@HAVE_INTROSPECTION_TRUE@		--output=$@ \
++@HAVE_INTROSPECTION_TRUE@		--pkg=epiphany-$(EPIPHANY_API_VERSION) \
+ @HAVE_INTROSPECTION_TRUE@		-DEPIPHANY_COMPILATION \
+ @HAVE_INTROSPECTION_TRUE@		-I$(top_srcdir)/embed \
+ @HAVE_INTROSPECTION_TRUE@		-I$(top_srcdir)/lib \
diff --git a/www/epiphany/pkg/PLIST b/www/epiphany/pkg/PLIST
index 222d8ff0c19..41c164adfb0 100644
--- a/www/epiphany/pkg/PLIST
+++ b/www/epiphany/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.19 2010/09/15 19:16:57 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.20 2011/04/07 19:41:32 jasper Exp $
 @bin bin/epiphany
 include/epiphany/
 include/epiphany/${M}/
@@ -36,6 +36,7 @@ include/epiphany/${M}/epiphany/ephy-type-builtins.h
 include/epiphany/${M}/epiphany/ephy-web-view.h
 include/epiphany/${M}/epiphany/ephy-window.h
 include/epiphany/${M}/epiphany/epiphany.h
+lib/girepository-1.0/Epiphany-${API_V}.typelib
 lib/pkgconfig/epiphany-${API_V}.pc
 @man man/man1/epiphany.1
 share/aclocal/epiphany.m4
@@ -119,6 +120,7 @@ share/epiphany/icons/hicolor/scalable/actions/location-entry.svg
 share/epiphany/icons/hicolor/scalable/status/
 share/epiphany/icons/hicolor/scalable/status/popup-hidden.svg
 share/epiphany/mime-types-permissions.xml
+share/gir-1.0/Epiphany-${API_V}.gir
 share/gnome/help/epiphany/
 share/gnome/help/epiphany/C/
 share/gnome/help/epiphany/C/epiphany.xml