diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 1abb22d..264f144 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f02c1c7dfa83cc4978134c0718fea83a4f02f61fec5597f838b4df5c2d4c5a12
-size 39985
+oid sha256:48c72d7a61e3e15e501f0008c844b5f345ea24aab84273dc8fc786bfdf73cb99
+size 39835
diff --git a/samba-doc.spec b/samba-doc.spec
index 3089f3e..4a0b7c9 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3016
+%define SOURCE_TIMESTAMP 3017
 %define BRANCH %{version}
 Version:        3.6.15
 Release:        0
diff --git a/samba.changes b/samba.changes
index b9f2197..9fb0118 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 14 09:59:26 UTC 2013 - lmuelle@suse.com
+
+- Don't package the SWAT man page while its build is disabled; (bnc#816647).
+
 -------------------------------------------------------------------
 Thu Jun  6 11:43:31 UTC 2013 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 494e7e8..8b9bbed 100644
--- a/samba.spec
+++ b/samba.spec
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3016
+%define SOURCE_TIMESTAMP 3017
 %define BRANCH %{version}
 Version:        3.6.15
 Release:        0
@@ -1385,7 +1385,7 @@ fi
 %doc %{_mandir}/man5/smbpasswd.5.*
 %doc %{_mandir}/man8/nmbd.8.*
 %doc %{_mandir}/man8/smbd.8.*
-%doc %{_mandir}/man8/swat.8.*
+%exclude %{_mandir}/man8/swat.8.*
 %doc %{_mandir}/man8/vfs_aio_fork.8.*
 %doc %{_mandir}/man8/vfs_aio_pthread.8.*
 %doc %{_mandir}/man8/vfs_acl_tdb.8.*
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 9459a1f..fcea630 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:7866289a264ecad13ad3f60923a2693b25c41887f2459b87b9b9da88c6c95eb9
-size 53681
+oid sha256:23f2fd43101156f9a4fdb34444e016eec7a1a0f4d24e86bd1f02139201f265fc
+size 53705