diff --git a/srcpkgs/gvfs-afc b/srcpkgs/gvfs-afc
new file mode 120000
index 0000000000..fcee85889f
--- /dev/null
+++ b/srcpkgs/gvfs-afc
@@ -0,0 +1 @@
+gvfs
\ No newline at end of file
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index efb5b7be9e..e017285ec9 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -1,34 +1,27 @@
 # Template file for 'gvfs'
 pkgname=gvfs
-version=1.20.3
+version=1.22.2
 revision=1
 build_style=gnu-configure
-configure_args="--disable-hal --disable-afc
+configure_args="--disable-hal $(vopt_enable systemd)
  --with-bash-completion-dir=/usr/share/bash-completion/completions"
 hostmakedepends="pkg-config intltool libxslt docbook-xsl"
 makedepends="
- libbluetooth-devel dbus-glib-devel libgudev-devel>=183 libexif-devel libbluray-devel
+ libbluetooth-devel dbus-glib-devel libgudev-devel 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 libmtp-devel
- avahi-glib-libs-devel udisks2-devel libgcrypt-devel
- libobexftp-devel gnome-online-accounts-devel>=3.12"
+ avahi-glib-libs-devel udisks2-devel libgcrypt-devel $(vopt_if systemd systemd-devel)
+ libobexftp-devel libimobiledevice-devel gnome-online-accounts-devel>=3.12"
 short_desc="Userspace virtual filesystem"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=646b1906b1c85876fa07299246855f16836080466dde1826003bbbd4b9415cba
+checksum=8d08c4927b6c20d990498c23280017e7033b31a386f09b4c3ce5bedd20316250
 
 # Package build options
 build_options="systemd"
 
-if [ "$build_option_systemd" ]; then
-	configure_args+=" --enable-systemd"
-	makedepends+=" systemd-devel"
-else
-	configure_args+=" --disable-systemd"
-fi
-
 post_install() {
 	ln -s gvfs-open ${DESTDIR}/usr/bin/gnome-open
 }
@@ -39,42 +32,44 @@ gvfs-devel_package() {
 		vmove usr/include
 	}
 }
-
+gvfs-afc_package() {
+	short_desc+=" - Apple mobile device backend"
+	depends="gvfs-${version}_${revision}"
+	pkg_install() {
+		vmove usr/libexec/gvfsd-afc
+		vmove usr/libexec/gvfs-afc-volume-monitor
+		vmove usr/share/dbus-1/services/org.gtk.Private.AfcVolumeMonitor.service
+		vmove usr/share/gvfs/remote-volume-monitors/afc.monitor
+	}
+}
 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
@@ -82,11 +77,9 @@ gvfs-gphoto2_package() {
 		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
@@ -95,7 +88,6 @@ gvfs-mtp_package() {
 		vmove usr/share/gvfs/mounts/mtp.mount
 	}
 }
-
 gvfs-obex_package() {
 	short_desc+=" - OBEX backend"
 	depends="obexftp gvfs>=${version}_${revision}"
@@ -104,11 +96,9 @@ gvfs-obex_package() {
 		vmove "usr/share/gvfs/mounts/obex*"
 	}
 }
-
 gvfs-smb_package() {
 	short_desc+=" - SMB/CIFS (Windows client) backend"
 	depends="gvfs>=${version}_${revision}"
-	replaces="gvfs<1.18.3_2"
 	triggers="gsettings-schemas"
 	pkg_install() {
 		vmove usr/libexec/gvfsd-smb