diff --git a/x11/gnome/gvfs/Makefile b/x11/gnome/gvfs/Makefile
index 844e52948d7..733f5cf2fc5 100644
--- a/x11/gnome/gvfs/Makefile
+++ b/x11/gnome/gvfs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2010/05/27 06:49:45 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.29 2010/06/19 10:33:39 ajacoutot Exp $
 
 COMMENT-main=	GNOME virtual file system
 COMMENT-smb=	samba module for GVFS
@@ -6,7 +6,7 @@ COMMENT-smb=	samba module for GVFS
 GNOME_PROJECT=	gvfs
 GNOME_VERSION=	1.6.2
 
-PKGNAME-main=	${DISTNAME}
+PKGNAME-main=	${DISTNAME}p0
 PKGNAME-smb=	${GNOME_PROJECT}-smb-${GNOME_VERSION}
 
 SHARED_LIBS +=  gvfscommon           3.0      # .0.0
diff --git a/x11/gnome/gvfs/pkg/PFRAG.shared-main b/x11/gnome/gvfs/pkg/PFRAG.shared-main
index 90d398f5857..99eb7fab3d3 100644
--- a/x11/gnome/gvfs/pkg/PFRAG.shared-main
+++ b/x11/gnome/gvfs/pkg/PFRAG.shared-main
@@ -1,6 +1,8 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.2 2009/10/11 13:32:28 ajacoutot Exp $
+@comment $OpenBSD: PFRAG.shared-main,v 1.3 2010/06/19 10:33:39 ajacoutot Exp $
 lib/gio/modules/libgiogconf.so
 lib/gio/modules/libgioremote-volume-monitor.so
 lib/gio/modules/libgvfsdbus.so
 @lib lib/libgvfscommon-dnssd.so.${LIBgvfscommon-dnssd_VERSION}
 @lib lib/libgvfscommon.so.${LIBgvfscommon_VERSION}
+@exec %D/bin/gio-querymodules %D/lib/gio/modules/
+@unexec-delete %D/bin/gio-querymodules %D/lib/gio/modules/
diff --git a/x11/gnome/gvfs/pkg/PLIST-main b/x11/gnome/gvfs/pkg/PLIST-main
index 52bc6bc5588..f5605ba03d9 100644
--- a/x11/gnome/gvfs/pkg/PLIST-main
+++ b/x11/gnome/gvfs/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.10 2010/04/26 09:42:36 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.11 2010/06/19 10:33:39 ajacoutot Exp $
 @pkgpath ${BASE_PKGPATH}
 %%SHARED%%
 @bin bin/gvfs-cat
@@ -24,12 +24,12 @@ include/gvfs-client/gvfs/gvfsurimapper.h
 include/gvfs-client/gvfs/gvfsuriutils.h
 lib/gio/
 lib/gio/modules/
-lib/gio/modules/libgiogconf.a
-lib/gio/modules/libgiogconf.la
-lib/gio/modules/libgioremote-volume-monitor.a
-lib/gio/modules/libgioremote-volume-monitor.la
-lib/gio/modules/libgvfsdbus.a
-lib/gio/modules/libgvfsdbus.la
+@comment lib/gio/modules/libgiogconf.a
+@comment lib/gio/modules/libgiogconf.la
+@comment lib/gio/modules/libgioremote-volume-monitor.a
+@comment lib/gio/modules/libgioremote-volume-monitor.la
+@comment lib/gio/modules/libgvfsdbus.a
+@comment lib/gio/modules/libgvfsdbus.la
 lib/libgvfscommon-dnssd.a
 lib/libgvfscommon-dnssd.la
 lib/libgvfscommon.a