diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index ebe1cb5ec313d..adddff2bb1a7b 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,3 +1,4 @@
 DIST gvfs-1.24.2.tar.xz 1627808 SHA256 0949eaedd1df7175f8d7ee2700df8210d1f854b8ee37d963bc32ee7091eeb228 SHA512 4e5a3150ec4a57ca1229653fd2ce91840e8f7c372de8eb3cd9196b83a687c4336b6fd6fec3f6f6dca740ff1033906cce8f42377c45014f4ce7fd9c33bdcedc59 WHIRLPOOL c65c2402a77cb5de3180f9988b6f0c29af3d979863e32943bca70a30dda89197a0747ed18ebfffe6d70a06d790be195a749c7b34afbfd780c80273aacad9844f
 DIST gvfs-1.26.3.tar.xz 1682264 SHA256 a70f75fa60d66f3f478c0c8aec43d0e43455a8cc75a4dfa8029e51c816401b4a SHA512 ce75dbb42c07572b4829deeacee39a1875a894bc874eb6e542ca42c3908150d890b7dbb39fadb744fecdab635fb1fedd3df31fabf5bd7be0fa537714f874c94e WHIRLPOOL d048d411caa614d5aebcb1026af5870d589661f4db527b07f525c1c1a68199e0d6b8a428f6d9afa0291a7222d04c723d1442c08cc132fc1fc30973fc3946da3c
 DIST gvfs-1.28.3.tar.xz 1497040 SHA256 458c4cb68570f6ef4a9e152995c62d0057c3e0a07ed64d84c7200cdd22f0bd17 SHA512 a448ea9878b71c8d11933cbcf951fd0b0f7a2a849cb9dd5da9950967150d2c39b6d571a8000cd765334436d869d26ca0108eb656e84571ac9a33d0c6bd9334b7 WHIRLPOOL 7b21ec5cee926c1d7fe99f2f36ae982a3714812b6032d2732d6f0a4a3aaab264466ed95fb7beb5b6dee6b39d835c7586ebbd32c7d34b2b3726685c031b8671c1
+DIST gvfs-1.30.1.1.tar.xz 1891052 SHA256 585b5de66eb99a09c020f34955db31e4764c8260a8afbb761ae264a958152ecc SHA512 4abda3a75a32c76703f96afe4fb478186d172dc1179639143faf52810cc7a6b8796c44361fd6ac5be5667bed66c61dfa245de94526d0f256e770ff9b56b11bfe WHIRLPOOL 414575800f1fef9c739e3dfce8a9701dc04892ea919f380be819083326b714f68b8e829a284f4abf7a0078bce9ffba3193eba97e26bbb8e1cae3b611fcf718cc
diff --git a/gnome-base/gvfs/gvfs-1.30.1.1.ebuild b/gnome-base/gvfs/gvfs-1.30.1.1.ebuild
new file mode 100644
index 0000000000000..e9821e23608d7
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.30.1.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 gnome2 systemd
+
+DESCRIPTION="Virtual filesystem implementation for gio"
+HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive bluray cdda fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
+REQUIRED_USE="
+	cdda? ( udev )
+	google? ( gnome-online-accounts )
+	mtp? ( udev )
+	udisks? ( udev )
+	systemd? ( udisks )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	app-crypt/gcr:=
+	>=dev-libs/glib-2.49.3:2
+	sys-apps/dbus
+	dev-libs/libxml2:2
+	net-misc/openssh
+	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	archive? ( app-arch/libarchive:= )
+	bluray? ( media-libs/libbluray )
+	fuse? ( >=sys-fs/fuse-2.8.0 )
+	gnome-keyring? ( app-crypt/libsecret )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= )
+	google? (
+		>=dev-libs/libgdata-0.17.3:=[crypt,gnome-online-accounts]
+		>=net-libs/gnome-online-accounts-3.17.1:= )
+	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
+	gtk? ( >=x11-libs/gtk+-3.0:3 )
+	http? ( >=net-libs/libsoup-2.42:2.4 )
+	ios? (
+		>=app-pda/libimobiledevice-1.2:=
+		>=app-pda/libplist-1:= )
+	mtp? ( >=media-libs/libmtp-1.1.12 )
+	nfs? ( >=net-fs/libnfs-1.9.7 )
+	policykit? (
+		sys-auth/polkit
+		sys-libs/libcap )
+	samba? ( || (
+		( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-4[smbclient] )
+		>=net-fs/samba-4[client] ) )
+	systemd? ( >=sys-apps/systemd-206:0= )
+	udev? (
+		cdda? ( dev-libs/libcdio-paranoia )
+		virtual/libgudev:=
+		virtual/libudev:= )
+	udisks? ( >=sys-fs/udisks-1.97:2 )
+	zeroconf? ( >=net-dns/avahi-0.6 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	test? (
+		>=dev-python/twisted-core-12.3.0
+		|| (
+			net-analyzer/netcat
+			net-analyzer/netcat6 ) )
+	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
+"
+# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
+# test dependencies needed per https://bugzilla.gnome.org/700162
+
+# Tests with multiple failures, this is being handled upstream at:
+# https://bugzilla.gnome.org/700162
+RESTRICT="test"
+
+src_prepare() {
+	if ! use udev; then
+		sed -e 's/gvfsd-burn/ /' \
+			-e 's/burn.mount.in/ /' \
+			-e 's/burn.mount/ /' \
+			-i daemon/Makefile.am || die
+
+		# Uncomment when eautoreconf stops being needed always
+		eautoreconf
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-documentation installs man pages
+	# --disable-obexftp, upstream bug #729945
+	gnome2_src_configure \
+		--disable-gdu \
+		--disable-hal \
+		--enable-bash-completion \
+		--enable-documentation \
+		--enable-gcr \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
+		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		$(use_enable afp) \
+		$(use_enable archive) \
+		$(use_enable bluray) \
+		$(use_enable cdda) \
+		$(use_enable fuse) \
+		$(use_enable gnome-keyring keyring) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable google) \
+		$(use_enable gphoto2) \
+		$(use_enable gtk) \
+		$(use_enable http) \
+		$(use_enable ios afc) \
+		$(use_enable mtp libmtp) \
+		$(use_enable nfs) \
+		$(use_enable policykit admin) \
+		$(use_enable samba) \
+		$(use_enable systemd libsystemd-login) \
+		$(use_enable udev gudev) \
+		$(use_enable udev) \
+		$(use_enable udisks udisks2) \
+		$(use_enable zeroconf avahi)
+}