diff --git a/gvfs.changes b/gvfs.changes
index 8844c47..57b3674 100644
--- a/gvfs.changes
+++ b/gvfs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep  6 08:40:47 UTC 2017 - dimstar@opensuse.org
+
+- License: LGPL-2.1+ AND GPL-3.0: gvfsd-trash links against
+  trashlib, which is licensed GPL-3.0.
+
 -------------------------------------------------------------------
 Mon Sep  4 18:44:26 UTC 2017 - zaitor@opensuse.org
 
diff --git a/gvfs.spec b/gvfs.spec
index a8f0986..dce9011 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -18,12 +18,11 @@
 
 %define with_udisks2 1
 %define with_cdda 1
-
 Name:           gvfs
 Version:        1.33.92
 Release:        0
 Summary:        VFS functionality for GLib
-License:        LGPL-2.0+
+License:        LGPL-2.0+ AND GPL-3.0
 Group:          Development/Libraries/C and C++
 Url:            http://www.gnome.org
 Source0:        http://download.gnome.org/sources/gvfs/1.33/%{name}-%{version}.tar.xz
@@ -32,30 +31,17 @@ Source99:       baselibs.conf
 Patch5:         gvfs-nvvfs.patch
 # PATCH-FEATURE-SLE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus
 Patch6:         gvfs-nds.patch
-%if !0%{?is_opensuse}
-# needed for patches 5 and 6
-BuildRequires:  autoconf
-%endif
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fuse-devel
 BuildRequires:  intltool
 BuildRequires:  libarchive-devel
 BuildRequires:  libavahi-glib-devel
-%if %{with_cdda}
-BuildRequires:  pkgconfig(libcdio_paranoia) >= 0.78.2
-%endif
 BuildRequires:  libgcrypt-devel
-%if !%{with_udisks2}
-BuildRequires:  libgdu-devel
-%endif
 BuildRequires:  libgphoto2-devel
 BuildRequires:  libimobiledevice-devel >= 1.2
 BuildRequires:  libsoup-devel >= 2.34.0
 BuildRequires:  libtool
-BuildRequires:  pkg-config
-%if !0%{?is_opensuse}
-BuildRequires:  translation-update-upstream
-%endif
+BuildRequires:  pkgconfig
 BuildRequires:  xsltproc
 BuildRequires:  pkgconfig(gcr-base-3)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -68,28 +54,40 @@ BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libcap)
 BuildRequires:  pkgconfig(libgdata) >= 0.17.3
 BuildRequires:  pkgconfig(libmtp) >= 1.1.5
-%if 0%{?is_opensuse}
-BuildRequires:  pkgconfig(libnfs) >= 1.9.8
-%endif
 BuildRequires:  pkgconfig(libsecret-unstable)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libusb-1.0) >= 1.0.21
 BuildRequires:  pkgconfig(polkit-gobject-1)
 BuildRequires:  pkgconfig(smbclient)
-%if %{with_udisks2}
-BuildRequires:  pkgconfig(udisks2) >= 1.97
-%endif
 Recommends:     %{name}-lang
 Recommends:     gvfs-backends
 Recommends:     gvfs-common
 Recommends:     gvfs-fuse
+%glib2_gio_module_requires
+%{?systemd_requires}
+%if !0%{?is_opensuse}
+# needed for patches 5 and 6
+BuildRequires:  autoconf
+%endif
+%if %{with_cdda}
+BuildRequires:  pkgconfig(libcdio_paranoia) >= 0.78.2
+%endif
+%if !%{with_udisks2}
+BuildRequires:  libgdu-devel
+%endif
+%if !0%{?is_opensuse}
+BuildRequires:  translation-update-upstream
+%endif
+%if 0%{?is_opensuse}
+BuildRequires:  pkgconfig(libnfs) >= 1.9.8
+%endif
+%if %{with_udisks2}
+BuildRequires:  pkgconfig(udisks2) >= 1.97
+%endif
 %if !0%{?is_opensuse}
 # The library gvfscommon was converted to a private library and is not used outside of gvfs
 Obsoletes:      libgvfscommon0 <= %{version}
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%glib2_gio_module_requires
-%{?systemd_requires}
 
 %description
 VFS functionality for GLib.
@@ -118,14 +116,14 @@ This package provides a gvfs backend that supports Samba.
 
 %package backends
 Summary:        VFS functionality for GLib
-License:        LGPL-2.0+ and GPL-3.0
+License:        LGPL-2.0+ AND GPL-3.0
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
 Recommends:     gvfs-backend-afc
+%glib2_gsettings_schema_requires
 %if %{with_udisks2}
 Recommends:     udisks2
 %endif
-%glib2_gsettings_schema_requires
 
 %description backends
 VFS functionality for GLib.
@@ -154,6 +152,7 @@ This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
 %lang_package
+
 %prep
 %setup -q
 %if !0%{?is_opensuse}