Index: head/devel/gvfs/Makefile
===================================================================
--- head/devel/gvfs/Makefile
+++ head/devel/gvfs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gvfs
 PORTVERSION=	1.26.3
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -15,7 +16,7 @@
 		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libgcr-base-3.so:${PORTSDIR}/security/gcr \
-		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+		libsecret-1.so:${PORTSDIR}/security/libsecret
 
 PORTSCOUT=	limitw:1,even
 
@@ -33,7 +34,6 @@
 		--disable-gdu \
 		--disable-udev \
 		--disable-goa \
-		--disable-keyring \
 		--disable-libmtp \
 		--disable-gtk
 
@@ -92,10 +92,6 @@
 PLIST_SUB+=	HAL="@comment "
 .endif
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=722411
-post-patch:
-	@${RM} ${WRKSRC}/monitor/hal/gvfsdbusutils.[ch]
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/remote-volume-monitors
 	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/systemd
Index: head/devel/gvfs/files/common_Makefile.am
===================================================================
--- head/devel/gvfs/files/common_Makefile.am
+++ head/devel/gvfs/files/common_Makefile.am
@@ -1,18 +0,0 @@
---- common/Makefile.am.orig	2015-02-13 07:19:44 UTC
-+++ common/Makefile.am
-@@ -43,6 +43,15 @@ libgvfscommon_la_LIBADD =	\
- 	$(GLIB_LIBS)		\
- 	$(BLURAY_LIBS)
- 
-+if USE_HAL
-+libgvfscommon_la_SOURCES += 	\
-+	gvfsdbusutils.c		gvfsdbusutils.h
-+libgvfscommon_la_CFLAGS +=	\
-+	$(DBUS_CFLAGS)
-+libgvfscommon_la_LIBADD =	\
-+	$(DBUS_LIBS)
-+endif
-+
- libgvfscommon_monitor_la_SOURCES = 	\
- 	gvfsmountinfo.h gvfsmountinfo.c \
- 	$(NULL)
Index: head/devel/gvfs/files/monitor_hal_Makefile.am
===================================================================
--- head/devel/gvfs/files/monitor_hal_Makefile.am
+++ head/devel/gvfs/files/monitor_hal_Makefile.am
@@ -1,10 +0,0 @@
---- monitor/hal/Makefile.am.orig	2015-02-03 15:52:20 UTC
-+++ monitor/hal/Makefile.am
-@@ -23,7 +23,6 @@ gvfs_hal_volume_monitor_SOURCES =			\
- 	ghalvolume.c		ghalvolume.h		\
- 	ghalmount.c		ghalmount.h		\
- 	ghalvolumemonitor.c	ghalvolumemonitor.h	\
--	gvfsdbusutils.c		gvfsdbusutils.h		\
- 	$(NULL)
- 
- gvfs_hal_volume_monitor_CFLAGS =		\