diff --git a/gvfs.changes b/gvfs.changes
index 280e16b..170b56d 100644
--- a/gvfs.changes
+++ b/gvfs.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Jul  6 06:47:22 UTC 2016 - fbui@suse.com
+
+- Replace pkgconfig(libsystemd-login) with pkgconfig(libsystemd):
+  Nowadays pkgconfig(libsystemd) replaces all libsystemd-* libs,
+  which are obsolete.
+
+-------------------------------------------------------------------
+Tue Jul  5 06:50:12 UTC 2016 - tyang@suse.com
+
+- Fix "gvfs-smb timeout by message bus issue" (bsc#983992):
+  + Add %glib2_gsettings_schema_require to preamble.
+  + Add %glib2_gsettings_schema_post/postun to respective scripts
+    of -backend-samba subpackage.
+
 -------------------------------------------------------------------
 Tue May 10 07:05:41 UTC 2016 - fcrozat@suse.com
 
diff --git a/gvfs.spec b/gvfs.spec
index 85597e1..dbc95c8 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -68,7 +68,7 @@ BuildRequires:  pkgconfig(libmtp) >= 1.1.5
 BuildRequires:  pkgconfig(libnfs)
 %endif
 BuildRequires:  pkgconfig(libsecret-unstable)
-BuildRequires:  pkgconfig(libsystemd-login) >= 44
+BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(smbclient)
 %if %{with_udisks2}
 BuildRequires:  pkgconfig(udisks2) >= 1.97
@@ -101,6 +101,7 @@ Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
 Requires:       %{name}-backends = %{version}
 Supplements:    packageand(%{name}:%(rpm -q --qf "%%{name}" --whatprovides libsmbclient)
+%glib2_gsettings_schema_requires
 
 %description backend-samba
 This package provides a gvfs backend that supports Samba.
@@ -177,6 +178,12 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
 %postun backends
 %glib2_gsettings_schema_postun
 
+%post backend-samba
+%glib2_gsettings_schema_post
+
+%postun backend-samba
+%glib2_gsettings_schema_postun
+
 %clean
 rm -rf %{buildroot}