diff --git a/srcpkgs/gvfs-afp b/srcpkgs/gvfs-afp
new file mode 120000
index 00000000000..fcee85889f6
--- /dev/null
+++ b/srcpkgs/gvfs-afp
@@ -0,0 +1 @@
+gvfs
\ No newline at end of file
diff --git a/srcpkgs/gvfs-cdda b/srcpkgs/gvfs-cdda
new file mode 120000
index 00000000000..fcee85889f6
--- /dev/null
+++ b/srcpkgs/gvfs-cdda
@@ -0,0 +1 @@
+gvfs
\ No newline at end of file
diff --git a/srcpkgs/gvfs-goa b/srcpkgs/gvfs-goa
new file mode 120000
index 00000000000..fcee85889f6
--- /dev/null
+++ b/srcpkgs/gvfs-goa
@@ -0,0 +1 @@
+gvfs
\ No newline at end of file
diff --git a/srcpkgs/gvfs-gphoto2 b/srcpkgs/gvfs-gphoto2
new file mode 120000
index 00000000000..fcee85889f6
--- /dev/null
+++ b/srcpkgs/gvfs-gphoto2
@@ -0,0 +1 @@
+gvfs
\ No newline at end of file
diff --git a/srcpkgs/gvfs-mtp b/srcpkgs/gvfs-mtp
new file mode 120000
index 00000000000..fcee85889f6
--- /dev/null
+++ b/srcpkgs/gvfs-mtp
@@ -0,0 +1 @@
+gvfs
\ No newline at end of file
diff --git a/srcpkgs/gvfs-smb b/srcpkgs/gvfs-smb
new file mode 120000
index 00000000000..fcee85889f6
--- /dev/null
+++ b/srcpkgs/gvfs-smb
@@ -0,0 +1 @@
+gvfs
\ No newline at end of file
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index c679485da6f..c2bb757d174 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,13 +1,13 @@
 # Template file for 'gvfs'
 pkgname=gvfs
 version=1.18.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-hal --disable-afc
+configure_args="--disable-hal --disable-afc --disable-obexftp
  --with-bash-completion-dir=/usr/share/bash-completion/completions"
-hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection"
-makedepends="libbluetooth-devel dbus-glib-devel
- libopenobex-devel libgudev-devel>=183 libexif-devel libbluray-devel
+hostmakedepends="pkg-config intltool libxslt docbook-xsl"
+makedepends="
+ libbluetooth-devel dbus-glib-devel libgudev-devel>=183 libexif-devel libbluray-devel
  fuse-devel libarchive-devel>=3.1.2 libcdio-devel libsoup-gnome-devel>=2.44
  libgphoto2-devel libsecret-devel gtk+3-devel samba-devel systemd-devel
  avahi-glib-libs-devel udisks2-devel libgcrypt-devel libmtp-devel
@@ -30,6 +30,76 @@ gvfs-devel_package() {
 	}
 }
 
+gvfs-afp_package() {
+	short_desc+=" - Apple Filing Protocol (AFP) backend"
+	depends="gvfs>=${version}_${revision}"
+	replaces="gvfs<1.18.3_2"
+	pkg_install() {
+		vmove "usr/libexec/gvfsd-afp*"
+		vmove "usr/share/gvfs/mounts/afp*"
+	}
+}
+
+gvfs-cdda_package() {
+	short_desc+=" - CD-ROM backend"
+	depends="gvfs>=${version}_${revision}"
+	replaces="gvfs<1.18.3_2"
+	pkg_install() {
+		vmove "usr/libexec/gvfsd-cd*"
+		vmove "usr/share/gvfs/mounts/cd*"
+	}
+}
+	
+gvfs-goa_package() {
+	short_desc+=" - Gnome Online Accounts (webservices) backend"
+	depends="gvfs>=${version}_${revision}"
+	replaces="gvfs<1.18.3_2"
+	pkg_install() {
+		vmove usr/libexec/gvfs-goa-volume-monitor
+		vmove usr/share/dbus-1/services/org.gtk.Private.GoaVolumeMonitor.service
+		vmove usr/share/gvfs/remote-volume-monitors/goa.monitor
+	}
+}
+
+gvfs-gphoto2_package() {
+	short_desc+=" - gphoto2 (PTP camera/MTP media player) backend"
+	depends="gvfs>=${version}_${revision}"
+	replaces="gvfs<1.18.3_2"
+	pkg_install() {
+		vmove usr/libexec/gvfs-gphoto2-volume-monitor
+		vmove usr/libexec/gvfsd-gphoto2
+		vmove usr/share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
+		vmove usr/share/gvfs/remote-volume-monitors/gphoto2.monitor
+	}
+}
+
+gvfs-mtp_package() {
+	short_desc+=" - MTP backend"
+	depends="gvfs>=${version}_${revision}"
+	replaces="gvfs<1.18.3_2"
+	pkg_install() {
+		vmove usr/libexec/gvfs-mtp-volume-monitor
+		vmove usr/libexec/gvfsd-mtp
+		vmove usr/share/dbus-1/services/org.gtk.Private.MTPVolumeMonitor.service
+		vmove usr/share/gvfs/remote-volume-monitors/mtp.monitor
+		vmove usr/share/gvfs/mounts/mtp.mount
+	}
+}
+
+gvfs-smb_package() {
+	short_desc+=" - SMB/CIFS (Windows client) backend"
+	depends="gvfs>=${version}_${revision}"
+	replaces="gvfs<1.18.3_2"
+	pkg_install() {
+		vmove usr/libexec/gvfsd-smb
+		vmove usr/libexec/gvfsd-smb-browse
+		vmove usr/share/GConf/gsettings/gvfs-smb.convert
+		vmove usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
+		vmove usr/share/gvfs/mounts/smb-browse.mount
+		vmove usr/share/gvfs/mounts/smb.mount
+	}
+}
+
 gvfs_package() {
 	pkg_install() {
 		vmove all