diff --git a/patches.tar.bz2 b/patches.tar.bz2
index eab532f..f22f22c 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61118ef4aaf6a7884de12391dbd004cd573136a28e410b7d0b1abe1b2846cc46
-size 42717
+oid sha256:e3ddab53613da0d8e042bd61d1cd2f0631646827ec10264e5aaa90857aa39af0
+size 43478
diff --git a/samba.changes b/samba.changes
index e1f1831..a9c271c 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep 26 17:55:13 UTC 2016 - nopower@suse.com
+
+- Include vfstest in samba-test; (bsc#1001203).
+
+-------------------------------------------------------------------
+Wed Sep 21 08:55:37 UTC 2016 - nopower@suse.com
+
+- s3/winbindd: using default domain with user@domain.com format
+  fails; (bsc#997833).
+
 -------------------------------------------------------------------
 Tue Sep 20 18:25:21 UTC 2016 - jmcdonough@suse.com
 
diff --git a/samba.keyring b/samba.keyring
index 39488f2..572aa5f 100644
--- a/samba.keyring
+++ b/samba.keyring
@@ -1,5 +1,8 @@
+pub   1024D/6568B7EA 2007-02-04 [expires: 2014-02-25]
+uid                  Samba Distribution Verification Key <samba-bugs@samba.org>
+sub   2048g/DA6DFB44 2007-02-04 [expires: 2014-02-25]
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
+Version: GnuPG v1.4.11 (GNU/Linux)
 
 mQGiBEXGOUcRBACooMht/2pmNT3bKZn1WEFQa+sXe6nxi3G6lH5bIBUKp85SDM57
 4qTcBIJXhwfGABeSvyUdZJbBxJDD5bNiO4k+Y5j3t8t9hb2FKgJ1bXL2aO5BbFnJ
@@ -11,73 +14,29 @@ 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
-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
-9X0HBZcWAJoDDzpbIrmOIXfqVtVIygrSB2irjg==
-=0Oxl
+PohmBBMRAgAmAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AFAk9Ki3oFCQ1GuTMA
+CgkQbzORW2Vot+oKMQCgxTZ6Gvo6cJsVdVLzUiJPcHD9tW4AnjiOTF6F0G60oPK0
+IxKOjGvVQ+4riEYEEBECAAYFAkXGOXUACgkQXNXaBxV7yV6oTwCgnSEFCs2pAwW5
+LU22AfVDwh9e5AkAn2k0dRoGj2UL/Js4qvf3sBqEw4rriEYEEBECAAYFAkXGOcYA
+CgkQIR7qMdg1EfZyDACgyvRXAmV0XUhH1vbNMEG9+sFXaCwAoOQTsk19i3Luy3Pw
++1gDaUeCzeLdiEYEEBECAAYFAkXIMMUACgkQ3L4Y/6A1U7wMMACgg4+AVtovhtY6
+y1qip9uZ8qwbnkkAni269FhHSPKfGGEnfkrN/Q2/3EY7iEYEEBECAAYFAkYNcugA
+CgkQp6cLM3ld2XFzGwCffyD/eMhEKCN6j5FCSbb3rhkyR/kAn0PlFtYrTNkrc1dO
+ezhvaZZCPBHWiEYEEBECAAYFAkZQmboACgkQVVCoNUmKuAcl1wCdEzFgS3DIgIhY
+y6Id5a9EqUjArLkAnArdjXskM952gLuyJjgictCiHdIeiEYEEBECAAYFAkZdvkMA
+CgkQw1Ohknblb7ZN8gCgjD/SWG0qBCBD7w19I5kVTijU9j4AmwbPf4wU7hY942tn
+1NxUyKwF+edxuQINBEXGOWEQCADIOV4TpVG6tDXU7YD1VjJ39xduomiWTg94dIOD
+g1bZHLvwUa5I1X7zsjYmghZ5Qa6WxNknbRywWnaP0POMXSMspVWnqBQTZknxdApM
+bMQEko0pPJSLwdTD3+0y5ht4edf08asWdSBT5yvu5Oak4O/Sa3P5lNIe8Q3SjfqR
+YiSX12uWgqeh+2JsQC50Lr9rnz9AMjKqZEx2v7XKnCkxoaFy1XwOpPjJtIuPFaSI
+5OunNsuhXYeGQv7MqqA2RNuulonoHgl9J6YzRBjdmDB28Lm+JKXyJpnHDrUkK6c5
+04EuxVXXQKOvLNPwod3U89OCZ3gFZU/zeESQdpWxXMiQvUqPAAQLCACnbn0cYaXh
+l3UnnQgyPYVUJV12/sAjhlgAQq08SPgTJp4GE/Jx9C2KMS7dlWYH4tjDSbeO+RLL
+d26npdhiy8Cn9UvsJvDs71/+5S2PTpV16eH5QzQZkvJ/PXkkRXQ1Ilovkvt5rKie
+HCx4n6QZb5td9AuAeRZp75UXERO7pXKG/57o/SzswrD/tSEKRpBKQED4eHsPohLw
+3dMKDWG6hLRf4GR8v+xKLFivqXr3ttELb9xS7ZyZqz6FSFucQAp6XY/xjnR3CFzf
+Kq9pHO4PwvhU53uQeI9suAHSPecxfUIcQfrCaN6K6ktEMY+KxeTJUgqB7Fnskqyn
+Cof0MN2OA40+iE8EGBECAA8CGwwFAk9Ki+YFCQ1GuYUACgkQbzORW2Vot+poJACe
+Mx7cSix0y3zIgTvAIty06thlOMUAn1hZdeMtAkWjaKfu8LWk/umBetPI
+=49fm
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/samba.spec b/samba.spec
index 50b4788..a284037 100644
--- a/samba.spec
+++ b/samba.spec
@@ -150,7 +150,7 @@ BuildRequires:  libcephfs-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3697
+%define SOURCE_TIMESTAMP 3712
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -173,14 +173,14 @@ Source1:        vendor-files.tar.bz2
 Source2:        patches.tar.bz2
 Source4:        baselibs.conf
 Source100:      samba-client-rpmlintrc
-PreReq:         /usr/bin/getent
-PreReq:         /usr/sbin/groupadd
-PreReq:         coreutils
-PreReq:         grep
+Requires:       /usr/bin/getent
+Requires:       /usr/sbin/groupadd
+Requires:       coreutils
+Requires:       grep
 %if 0%{?suse_version} > 1220
-PreReq:         %{fillup_prereq}
+Requires:       %{fillup_prereq}
 %endif
-PreReq:         samba-client >= %{version}
+Requires:       samba-client >= %{version}
 # Choose some features / extra packages here
 ############################################
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
@@ -263,11 +263,11 @@ Provides:       smbfs
 Obsoletes:      samba-gplv3-client < %{version}
 Obsoletes:      samba-client-gplv2 < %{version}
 %if 0%{?suse_version} > 0
-PreReq:         %{?insserv_prereq}
+Requires:       %{?insserv_prereq}
 %endif
-PreReq:         /sbin/chkconfig
-PreReq:         /sbin/ldconfig
-PreReq:         coreutils
+Requires:       /sbin/chkconfig
+Requires:       /sbin/ldconfig
+Requires:       coreutils
 %{?systemd_requires}
 Requires:       cifs-utils
 
@@ -313,8 +313,8 @@ Branch:         %{BRANCH}
 Summary:        Samba Documentation
 License:        GPL-3.0+
 Group:          Documentation/Other
-PreReq:         coreutils
-PreReq:         findutils
+Requires:       coreutils
+Requires:       findutils
 Obsoletes:      samba-gplv3-doc < %{version}
 Obsoletes:      samba-doc-gplv2 < %{version}
 %if 0%{?suse_version} > 1110
@@ -336,7 +336,7 @@ Summary:        Samba libraries
 License:        GPL-3.0+
 Group:          Development/Libraries/C and C++
 Requires:       krb5
-PreReq:         /sbin/ldconfig
+Requires:       /sbin/ldconfig
 %if 0%{?suse_version} > 1210 &&  0%{?suse_version} < 1315
 Requires:       libfam0-gamin
 %endif
@@ -391,7 +391,7 @@ License:        GPL-3.0+
 Group:          Applications/System
 Requires:       samba = %{version}
 Requires:       samba-winbind = %{version}
-PreReq:         /sbin/ldconfig
+Requires:       /sbin/ldconfig
 
 %description test
 samba-test provides testing tools for both the server and client
@@ -417,12 +417,12 @@ Recommends:     logrotate
 Recommends:     /usr/sbin/nscd
 %endif
 %if 0%{?suse_version} > 0
-PreReq:         %{?insserv_prereq}
+Requires:       %{?insserv_prereq}
 %endif
-PreReq:         /sbin/ldconfig
-PreReq:         /usr/sbin/groupadd
-PreReq:         coreutils
-PreReq:         samba-client >= %{version}
+Requires:       /sbin/ldconfig
+Requires:       /usr/sbin/groupadd
+Requires:       coreutils
+Requires:       samba-client >= %{version}
 
 %description winbind
 This is the winbind-daemon and the wbinfo-tool.
@@ -950,7 +950,7 @@ Obsoletes:      libsmbclient < %{version}
 Summary:        Samba Client Library
 License:        GPL-3.0+
 Group:          System/Libraries
-PreReq:         /sbin/ldconfig
+Requires:       /sbin/ldconfig
 
 %description -n %{libsmbclient_name}
 This package includes the libsmbclient library.
@@ -981,7 +981,7 @@ Branch:         %{BRANCH}
 Summary:        Samba netapi Library
 License:        GPL-3.0+
 Group:          System/Libraries
-PreReq:         /sbin/ldconfig
+Requires:       /sbin/ldconfig
 
 %description -n %{libnetapi_name}
 This package includes the netapi library.
@@ -1009,7 +1009,7 @@ Branch:         %{BRANCH}
 Summary:        Samba libwbclient Library
 License:        LGPL-3.0+
 Group:          System/Libraries
-PreReq:         /sbin/ldconfig
+Requires:       /sbin/ldconfig
 %if 0%{?suse_version} > 1030
 Recommends:     samba-winbind = %{version}-%{release}
 %endif
@@ -1201,7 +1201,7 @@ rm \
 %if 0%{?suse_version}
 install -m 0644 vendor-files/config/sysconfig.ctdb %{buildroot}/%{_var}/adm/fillup-templates
 %else
-install -m 0644 ctdb/config/ctdb.sysconfig ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/ctdb
+install -m 0644 vendor-files/config/sysconfig.ctdb ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/ctdb
 %endif
 %if 0%{?suse_version} > 1220
 install -m 0755 ctdb/config/ctdb.service %{buildroot}%{_unitdir}/ctdb.service
@@ -2018,6 +2018,7 @@ fi
 %{_bindir}/masktest
 %{_bindir}/ndrdump
 %{_bindir}/smbtorture
+%{_bindir}/vfstest
 %{_mandir}/man1/gentest.1.*
 %{_mandir}/man1/locktest.1.*
 %{_mandir}/man1/masktest.1.*
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index b9cd77e..77e4cef 100644
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1db19efbc11b3897365877388e5f15d70d68f6b59a02474ae8b8c4344c1f7c44
-size 55702
+oid sha256:52b7e876143a50cbb75dc0b69447da1f40ba3730d1481cd2543154b75c70d279
+size 55809