diff --git a/srcpkgs/gvfs-devel b/srcpkgs/gvfs-devel
new file mode 120000
index 0000000000..fcee85889f
--- /dev/null
+++ b/srcpkgs/gvfs-devel
@@ -0,0 +1 @@
+gvfs
\ No newline at end of file
diff --git a/srcpkgs/gvfs/depends b/srcpkgs/gvfs/depends
new file mode 100644
index 0000000000..89acd330c2
--- /dev/null
+++ b/srcpkgs/gvfs/depends
@@ -0,0 +1,2 @@
+abi_depends=">=1.6.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/gvfs/gvfs-devel.template b/srcpkgs/gvfs/gvfs-devel.template
new file mode 100644
index 0000000000..80f0f4fbb8
--- /dev/null
+++ b/srcpkgs/gvfs/gvfs-devel.template
@@ -0,0 +1,38 @@
+# Template file for 'gvfs-devel'.
+#
+short_desc="${sourcepkg} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run pkg-config
+Add_dependency run intltool
+Add_dependency run libudev-devel
+Add_dependency run expat-devel
+Add_dependency run libbluetooth-devel
+Add_dependency run glib-devel
+Add_dependency run libgudev-devel
+Add_dependency run dbus-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run avahi-libs-devel
+Add_dependency run avahi-glib-libs-devel
+Add_dependency run libexif-devel
+Add_dependency run libusb-compat-devel
+Add_dependency run libxml2-devel
+Add_dependency run fuse-devel
+Add_dependency run libarchive-devel
+Add_dependency run libcdio-devel
+Add_dependency run libsoup-devel
+Add_dependency run libsoup-gnome-devel
+Add_dependency run libgphoto2-devel
+Add_dependency run libgnome-keyring-devel
+Add_dependency run GConf-devel
+Add_dependency run gnome-disk-utility-devel
+Add_dependency run gvfs
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
new file mode 100644
index 0000000000..0d0d922790
--- /dev/null
+++ b/srcpkgs/gvfs/template
@@ -0,0 +1,67 @@
+# Template file for 'gvfs'
+pkgname=gvfs
+version=1.6.0
+distfiles="${GNOME_SITE}/$pkgname/1.6/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--localstatedir=/var --disable-hal --disable-afc
+--disable-samba"
+short_desc="Userspace virtual filesystem"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=2e4c973e75c7af8d2d88232cd7742971f655fdbd7f5b687450b858484d88a0d3
+long_desc="
+ gvfs is a userspace virtual filesystem designed to work with the i/o
+ abstractions of gio (a library available in glib greater than 2.15). It
+ installs several modules that are automatically used by applications
+ using the APIs of libgio. There is also fuse support that allows
+ applications not using gio to access the gvfs filesystems."
+
+triggers="gio-modules"
+subpackages="$pkgname-devel"
+
+# XXX: Add samba dependency.
+Add_dependency run glibc
+Add_dependency run libudev
+Add_dependency run expat
+Add_dependency run libbluetooth
+Add_dependency run glib
+Add_dependency run libgudev
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run avahi-libs
+Add_dependency run avahi-glib-libs
+Add_dependency run libexif
+Add_dependency run libusb-compat
+Add_dependency run libxml2
+Add_dependency run fuse
+Add_dependency run libarchive
+Add_dependency run libcdio
+Add_dependency run libsoup
+Add_dependency run libsoup-gnome
+Add_dependency run libgphoto2
+Add_dependency run libgnome-keyring
+Add_dependency run GConf
+Add_dependency run gnome-disk-utility
+
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build libudev-devel
+Add_dependency build expat-devel
+Add_dependency build libbluetooth-devel
+Add_dependency build glib-devel
+Add_dependency build libgudev-devel
+Add_dependency build dbus-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build avahi-libs-devel
+Add_dependency build avahi-glib-libs-devel
+Add_dependency build libexif-devel
+Add_dependency build libusb-compat-devel
+Add_dependency build libxml2-devel
+Add_dependency build fuse-devel
+Add_dependency build libarchive-devel
+Add_dependency build libcdio-devel
+Add_dependency build libsoup-devel
+Add_dependency build libsoup-gnome-devel
+Add_dependency build libgphoto2-devel
+Add_dependency build libgnome-keyring-devel
+Add_dependency build GConf-devel
+Add_dependency build gnome-disk-utility-devel
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index a09569d891..ed7146c081 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -596,3 +596,5 @@ libcpufreq.so			libcpufreq		libcpufreq-devel
 libgucharmap.so			gucharmap		gucharmap-devel
 libgphoto2.so			libgphoto2		libgphoto2-devel
 libgphoto2_port.so		libgphoto2		libgphoto2-devel
+libgvfscommon.so		gvfs			gvfs-devel
+libgvfscommon-dnssd.so		gvfs			gvfs-devel