diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index b0722ffb00..e34033d5c7 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -20,7 +20,6 @@ GVFS_CONF_ENV = ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-con
 # Most of these are missing library support
 GVFS_CONF_OPTS = \
 	--disable-afc \
-	--disable-gcr \
 	--disable-gdu \
 	--disable-goa \
 	--disable-google \
@@ -36,6 +35,13 @@ else
 GVFS_CONF_OPTS += --disable-avahi
 endif
 
+ifeq ($(BR2_PACKAGE_GCR),y)
+GVFS_DEPENDENCIES += gcr
+GVFS_CONF_OPTS += --enable-gcr
+else
+GVFS_CONF_OPTS += --disable-gcr
+endif
+
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 GVFS_DEPENDENCIES += udev
 endif