diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 23a15de6fe1..fafedcf43d5 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,13 +1,14 @@
-# $OpenBSD: Makefile,v 1.4 2010/03/29 15:17:10 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2010/04/20 11:20:08 jasper Exp $
 
 COMMENT=		GObject Introspection
 
-GNOME_VERSION=		0.6.9
+GNOME_VERSION=		0.6.10
 GNOME_PROJECT=		gobject-introspection
 CATEGORIES=		devel
 
-SHARED_LIBS +=  girepository-1.0        0.0      # .0.0
-SHARED_LIBS +=  girepository-everything-1.0        0.0  # .1.0
+SHARED_LIBS +=  girepository-1.0     0.0      # .0.0
+SHARED_LIBS +=  girepository-everything-1.0 0.0      # .1.0
+SHARED_LIBS +=  girepository-gimarshallingtests-1.0 0.0      # .1.0
 
 HOMEPAGE=		http://live.gnome.org/GObjectIntrospection
 
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index d21a881b3e1..08367301442 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,5 +1,5 @@
-MD5 (gobject-introspection-0.6.9.tar.bz2) = N8tHPGuv0DxKSOHzfhnMBA==
-RMD160 (gobject-introspection-0.6.9.tar.bz2) = sEQd74o3rwlggCzANI719C9VGEg=
-SHA1 (gobject-introspection-0.6.9.tar.bz2) = FV3GJLJOMRHQ8tHqrO5oRxQecLU=
-SHA256 (gobject-introspection-0.6.9.tar.bz2) = EuoHX9uQeAsEc4K8es9IlsNNrUknb2yFEwRaP1hNWsY=
-SIZE (gobject-introspection-0.6.9.tar.bz2) = 544356
+MD5 (gobject-introspection-0.6.10.tar.bz2) = zfevZEoEB8P9LVe6K7NUnw==
+RMD160 (gobject-introspection-0.6.10.tar.bz2) = 4rlPu5CQg4xFecu7rYvKZcfWfFY=
+SHA1 (gobject-introspection-0.6.10.tar.bz2) = EJjqi4csCHI3yaeIDatGLlVyNPM=
+SHA256 (gobject-introspection-0.6.10.tar.bz2) = Nr1RGk1Fln+VUm+UcIs/Q2fp00SqEfMgb+btt/w6jUs=
+SIZE (gobject-introspection-0.6.10.tar.bz2) = 550501
diff --git a/devel/gobject-introspection/patches/patch-gir_Everything-1_0-expected_gir b/devel/gobject-introspection/patches/patch-gir_Everything-1_0-expected_gir
index 95ec013fbb5..89c6daf5c84 100644
--- a/devel/gobject-introspection/patches/patch-gir_Everything-1_0-expected_gir
+++ b/devel/gobject-introspection/patches/patch-gir_Everything-1_0-expected_gir
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gir_Everything-1_0-expected_gir,v 1.2 2010/03/29 15:17:10 jasper Exp $
---- gir/Everything-1.0-expected.gir.orig	Mon Mar 29 16:45:16 2010
-+++ gir/Everything-1.0-expected.gir	Mon Mar 29 16:45:20 2010
-@@ -11,7 +11,7 @@ and/or use gtk-doc annotations.  -->
+$OpenBSD: patch-gir_Everything-1_0-expected_gir,v 1.3 2010/04/20 11:20:08 jasper Exp $
+--- gir/Everything-1.0-expected.gir.orig	Sun Apr 18 20:11:38 2010
++++ gir/Everything-1.0-expected.gir	Tue Apr 20 12:05:02 2010
+@@ -12,7 +12,7 @@ and/or use gtk-doc annotations.  -->
    <package name="gobject-2.0"/>
    <namespace name="Everything"
               version="1.0"
diff --git a/devel/gobject-introspection/patches/patch-gir_Makefile_in b/devel/gobject-introspection/patches/patch-gir_Makefile_in
index 75a8e8aeb87..54175ea4e7c 100644
--- a/devel/gobject-introspection/patches/patch-gir_Makefile_in
+++ b/devel/gobject-introspection/patches/patch-gir_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gir_Makefile_in,v 1.3 2010/03/29 15:17:10 jasper Exp $
---- gir/Makefile.in.orig	Mon Mar 29 16:44:23 2010
-+++ gir/Makefile.in	Mon Mar 29 16:44:46 2010
-@@ -357,7 +357,7 @@ _gir_packages = $(foreach pkg,$($(_gir_name)_PACKAGES)
+$OpenBSD: patch-gir_Makefile_in,v 1.4 2010/04/20 11:20:08 jasper Exp $
+--- gir/Makefile.in.orig	Sun Apr 18 17:56:40 2010
++++ gir/Makefile.in	Tue Apr 20 12:05:02 2010
+@@ -370,7 +370,7 @@ _gir_packages = $(foreach pkg,$($(_gir_name)_PACKAGES)
  _gir_includes = $(foreach include,$($(_gir_name)_INCLUDES),--include=$(include))
  
  # Reuse the LIBTOOL variable from by automake if it's set
diff --git a/devel/gobject-introspection/pkg/PLIST b/devel/gobject-introspection/pkg/PLIST
index 228eab3f639..28cb235066c 100644
--- a/devel/gobject-introspection/pkg/PLIST
+++ b/devel/gobject-introspection/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2009/12/22 15:19:52 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.3 2010/04/20 11:20:08 jasper Exp $
 @bin bin/g-ir-compiler
 @bin bin/g-ir-generate
 bin/g-ir-scanner
@@ -7,6 +7,7 @@ include/gobject-introspection-1.0/girepository.h
 include/gobject-introspection-1.0/girffi.h
 lib/girepository-1.0/
 lib/girepository-1.0/Everything-1.0.typelib
+lib/girepository-1.0/GIMarshallingTests-1.0.typelib
 lib/girepository-1.0/GIRepository-2.0.typelib
 lib/girepository-1.0/GL-1.0.typelib
 lib/girepository-1.0/GLib-2.0.typelib
@@ -26,6 +27,9 @@ lib/libgirepository-1.0.la
 lib/libgirepository-everything-1.0.a
 lib/libgirepository-everything-1.0.la
 @lib lib/libgirepository-everything-1.0.so.${LIBgirepository-everything-1.0_VERSION}
+lib/libgirepository-gimarshallingtests-1.0.a
+lib/libgirepository-gimarshallingtests-1.0.la
+@lib lib/libgirepository-gimarshallingtests-1.0.so.${LIBgirepository-gimarshallingtests-1.0_VERSION}
 lib/pkgconfig/gobject-introspection-1.0.pc
 lib/pkgconfig/gobject-introspection-no-export-1.0.pc
 lib/python${MODPY_VERSION}/site-packages/gobject-introspection/
@@ -96,6 +100,7 @@ lib/python${MODPY_VERSION}/site-packages/gobject-introspection/giscanner/xmlwrit
 share/aclocal/introspection.m4
 share/gir-1.0/
 share/gir-1.0/Everything-1.0.gir
+share/gir-1.0/GIMarshallingTests-1.0.gir
 share/gir-1.0/GIRepository-2.0.gir
 share/gir-1.0/GL-1.0.gir
 share/gir-1.0/GLib-2.0.gir