diff --git a/gvfs.spec b/gvfs.spec
index e804472..d42c727 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -3,7 +3,7 @@
 
 Name: gvfs
 Version: 1.25.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Backends for the gio framework in GLib
 
 License: GPLv3 and LGPLv2+ and BSD and MPLv2.0
@@ -19,7 +19,6 @@ BuildRequires: dbus-glib-devel
 BuildRequires: gcr-devel
 BuildRequires: /usr/bin/ssh
 BuildRequires: libcdio-paranoia-devel
-BuildRequires: libgdata-devel >= %{libgdata_version}
 BuildRequires: libgudev1-devel
 BuildRequires: libsoup-devel >= 2.34.0
 BuildRequires: pkgconfig(avahi-client) pkgconfig(avahi-glib)
@@ -39,7 +38,6 @@ BuildRequires: libtool
 
 Requires: %{name}-client%{?_isa} = %{version}-%{release}
 Requires: glib2%{?_isa} >= %{glib2_version}
-Requires: libgdata%{?_isa} >= %{libgdata_version}
 Requires: udisks2
 
 # for file triggers
@@ -168,6 +166,8 @@ NFS network shares (Network File System) to applications using gvfs.
 Summary: GOA support for gvfs
 Requires: %{name}%{?_isa} = %{version}-%{release}
 BuildRequires: gnome-online-accounts-devel >= 3.7.1
+BuildRequires: libgdata-devel >= %{libgdata_version}
+Requires: libgdata%{?_isa} >= %{libgdata_version}
 
 %description goa
 This package provides seamless integration with gnome-online-accounts
@@ -253,7 +253,6 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/mounts/network.mount
 %{_datadir}/gvfs/mounts/ftp.mount
 %{_datadir}/gvfs/mounts/ftps.mount
-%{_datadir}/gvfs/mounts/google.mount
 %{_datadir}/gvfs/mounts/recent.mount
 %{_datadir}/dbus-1/services/org.gtk.vfs.UDisks2VolumeMonitor.service
 %{_datadir}/dbus-1/services/gvfs-daemon.service
@@ -270,7 +269,6 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_libexecdir}/gvfsd-cdda
 %{_libexecdir}/gvfsd-computer
 %{_libexecdir}/gvfsd-dav
-%{_libexecdir}/gvfsd-google
 %{_libexecdir}/gvfsd-http
 %{_libexecdir}/gvfsd-localtest
 %{_libexecdir}/gvfsd-burn
@@ -361,6 +359,8 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_libexecdir}/gvfs-goa-volume-monitor
 %{_datadir}/dbus-1/services/org.gtk.vfs.GoaVolumeMonitor.service
 %{_datadir}/gvfs/remote-volume-monitors/goa.monitor
+%{_datadir}/gvfs/mounts/google.mount
+%{_libexecdir}/gvfsd-google
 
 %files tests
 %dir %{_libexecdir}/installed-tests
@@ -368,6 +368,9 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Wed Sep 16 2015 Ondrej Holy <oholy@redhat.com> - 1.25.92-3
+- Move Google Drive backend into the goa subpackage
+
 * Mon Sep 14 2015 Kalev Lember <klember@redhat.com> - 1.25.92-2
 - Build Google Drive backend