diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 76660bfacd..27850dc898 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.47 2011/09/21 08:21:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.48 2011/09/21 13:37:14 ajacoutot Exp $
 
 COMMENT=	Python bindings for glib2 gobject
 
 GNOME_PROJECT=	pygobject
 GNOME_VERSION=	2.28.6
+EXTRACT_SUFX=	.tar.bz2
 
 PKGNAME=	py-gobject-${GNOME_VERSION}
 REVISION=	2
@@ -24,25 +25,21 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-EXTRACT_SUFX=		.tar.bz2
-
-WANTLIB += ffi gio-2.0 girepository-1.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 m pcre z
+WANTLIB += ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
+WANTLIB += pcre z
 
 MODULES=	devel/gettext \
 		lang/python \
 		x11/gnome
 
-MODGNOME_TOOLS=	goi
-
-BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	graphics/py-cairo
-LIB_DEPENDS=	devel/glib2 \
-		devel/libffi \
-		devel/gobject-introspection>=0.10.7p3
+LIB_DEPENDS=	devel/glib2
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	--enable-cairo
+
+# not really needed because we don't add "goi" to MODGNOME_TOOLS,
+# however it is clearer to explicitely note that it is disabled --
+# introspection support for py-gobject is now in devel/py-gobject3
+CONFIGURE_ARGS=	--disable-introspection
 
 REGRESS_DEPENDS=	${FULLPKGNAME}:${BUILD_PKGPATH}
 REGRESS_IS_INTERACTIVE= x11
diff --git a/devel/py-gobject/pkg/PLIST b/devel/py-gobject/pkg/PLIST
index 3c2aecf1fa..adabff6614 100644
--- a/devel/py-gobject/pkg/PLIST
+++ b/devel/py-gobject/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.19 2011/07/29 17:38:02 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.20 2011/09/21 13:37:14 ajacoutot Exp $
 @conflict py-gtk2-2.8.6*
 bin/pygobject-codegen-2.0
 include/pygtk-2.0/
@@ -8,54 +8,6 @@ lib/libpyglib-2.0-python${MODPY_VERSION}.a
 lib/libpyglib-2.0-python${MODPY_VERSION}.la
 @lib lib/libpyglib-2.0-python${MODPY_VERSION}.so.${LIBpyglib-2.0-python${MODPY_VERSION}_VERSION}
 lib/pkgconfig/pygobject-2.0.pc
-lib/python${MODPY_VERSION}/site-packages/gi/
-lib/python${MODPY_VERSION}/site-packages/gi/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gi/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/gi/__init__.pyo
-@comment lib/python${MODPY_VERSION}/site-packages/gi/_gi.a
-@comment lib/python${MODPY_VERSION}/site-packages/gi/_gi.la
-lib/python${MODPY_VERSION}/site-packages/gi/_gi.so
-@comment lib/python${MODPY_VERSION}/site-packages/gi/_gi_cairo.a
-@comment lib/python${MODPY_VERSION}/site-packages/gi/_gi_cairo.la
-lib/python${MODPY_VERSION}/site-packages/gi/_gi_cairo.so
-lib/python${MODPY_VERSION}/site-packages/gi/importer.py
-lib/python${MODPY_VERSION}/site-packages/gi/importer.pyc
-lib/python${MODPY_VERSION}/site-packages/gi/importer.pyo
-lib/python${MODPY_VERSION}/site-packages/gi/module.py
-lib/python${MODPY_VERSION}/site-packages/gi/module.pyc
-lib/python${MODPY_VERSION}/site-packages/gi/module.pyo
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/GIMarshallingTests.py
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/GIMarshallingTests.pyc
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/GIMarshallingTests.pyo
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/GLib.py
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/GLib.pyc
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/GLib.pyo
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/Gdk.py
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/Gdk.pyc
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/Gdk.pyo
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/Gio.py
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/Gio.pyc
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/Gio.pyo
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/Gtk.py
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/Gtk.pyc
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/Gtk.pyo
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/Pango.py
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/Pango.pyc
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/Pango.pyo
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/__init__.pyo
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/keysyms.py
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/keysyms.pyc
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/keysyms.pyo
-lib/python${MODPY_VERSION}/site-packages/gi/repository/
-lib/python${MODPY_VERSION}/site-packages/gi/repository/__init__.py
-lib/python${MODPY_VERSION}/site-packages/gi/repository/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/gi/repository/__init__.pyo
-lib/python${MODPY_VERSION}/site-packages/gi/types.py
-lib/python${MODPY_VERSION}/site-packages/gi/types.pyc
-lib/python${MODPY_VERSION}/site-packages/gi/types.pyo
 lib/python${MODPY_VERSION}/site-packages/glib/
 lib/python${MODPY_VERSION}/site-packages/glib/__init__.py
 lib/python${MODPY_VERSION}/site-packages/glib/__init__.pyc
@@ -97,6 +49,8 @@ lib/python${MODPY_VERSION}/site-packages/pygtk.pth
 lib/python${MODPY_VERSION}/site-packages/pygtk.py
 lib/python${MODPY_VERSION}/site-packages/pygtk.pyc
 lib/python${MODPY_VERSION}/site-packages/pygtk.pyo
+share/gtk-doc/
+share/gtk-doc/html/
 share/gtk-doc/html/pygobject/
 share/gtk-doc/html/pygobject/class-gioappinfo.html
 share/gtk-doc/html/pygobject/class-gioapplaunchcontext.html