diff --git a/x11/gnome/gvfs/Makefile b/x11/gnome/gvfs/Makefile
index 5bb2fd32b73..a69af445b98 100644
--- a/x11/gnome/gvfs/Makefile
+++ b/x11/gnome/gvfs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2011/06/15 07:21:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.50 2011/06/16 08:38:20 dcoppa Exp $
 
 COMMENT-main=	GNOME virtual file system
 COMMENT-smb=	samba module for GVFS
@@ -9,7 +9,8 @@ GNOME_VERSION=	1.8.2
 PKGNAME-main=	${DISTNAME}
 PKGNAME-smb=	${GNOME_PROJECT}-smb-${GNOME_VERSION}
 
-REVISION-main=	3
+REVISION-main=	4
+REVISION-smb=	0
 
 SHARED_LIBS +=  gvfscommon           3.0      # .0.0
 SHARED_LIBS +=  gvfscommon-dnssd     1.0      # .0.0
diff --git a/x11/gnome/gvfs/pkg/PLIST-main b/x11/gnome/gvfs/pkg/PLIST-main
index 13444551ba7..1da658e16d3 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.19 2011/05/28 08:15:34 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.20 2011/06/16 08:38:20 dcoppa Exp $
 @pkgpath ${BASE_PKGPATH}
 %%SHARED%%
 @bin bin/gvfs-cat
@@ -46,13 +46,11 @@ lib/libgvfscommon.la
 share/GConf/
 share/GConf/gsettings/
 share/GConf/gsettings/gvfs-dns-sd.convert
-share/GConf/gsettings/gvfs-smb.convert
 share/applications/mount-archive.desktop
 share/dbus-1/services/gvfs-daemon.service
 share/dbus-1/services/gvfs-metadata.service
 share/glib-2.0/schemas/org.gnome.system.dns_sd.gschema.xml
 share/glib-2.0/schemas/org.gnome.system.gvfs.enums.xml
-share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
 share/gvfs/
 @sample ${SYSCONFDIR}/bash_completion.d/
 share/gvfs/gvfs-bash-completion.sh
diff --git a/x11/gnome/gvfs/pkg/PLIST-smb b/x11/gnome/gvfs/pkg/PLIST-smb
index 40c50b19738..f7377474ba5 100644
--- a/x11/gnome/gvfs/pkg/PLIST-smb
+++ b/x11/gnome/gvfs/pkg/PLIST-smb
@@ -1,5 +1,10 @@
-@comment $OpenBSD: PLIST-smb,v 1.1 2008/11/24 16:15:42 ajacoutot Exp $
+@comment $OpenBSD: PLIST-smb,v 1.2 2011/06/16 08:38:20 dcoppa Exp $
+@conflict gvfs-<=1.8.2p3
 @bin libexec/gvfsd-smb
 @bin libexec/gvfsd-smb-browse
+share/GConf/gsettings/gvfs-smb.convert
+share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
 share/gvfs/mounts/smb-browse.mount
 share/gvfs/mounts/smb.mount
+@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
+@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null