diff --git a/build-source-timestamp b/build-source-timestamp
index b87fa77..d39980d 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1 +1 @@
-SOURCE_TIMESTAMP="2874"
+SOURCE_TIMESTAMP="2876"
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 7909a40..6e02705 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8072ae9b5cb548e03a94c16c42d4d92f8b320600e07ea65a8ce8e09ee8dc2b1
-size 44081
+oid sha256:7614cfa477f4cf3386d6d204548babdb1961925ef265c2cb5d57c9540557a062
+size 44085
diff --git a/samba-doc.spec b/samba-doc.spec
index e024602..375f6b9 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 2874
+%define SOURCE_TIMESTAMP 2876
 %define BRANCH 3.6.9
 Version:        3.6.9
 Release:        0
diff --git a/samba.changes b/samba.changes
index 4787b48..40b24e9 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec  4 14:29:48 UTC 2012 - lmuelle@suse.com
+
+- On uninstall remove winbind from the pam configuration, invalidate the nscd
+  passwd and group cache and only recommend the install of nscd; (bnc#792340).
+
 -------------------------------------------------------------------
 Mon Dec  3 16:43:51 UTC 2012 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 6cc09a0..a049798 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 2874
+%define SOURCE_TIMESTAMP 2876
 %define BRANCH 3.6.9
 Version:        3.6.9
 Release:        0
@@ -372,12 +372,15 @@ Provides:       samba-client:/usr/sbin/winbindd
 Obsoletes:      samba-winbind-64bit
 %endif
 Requires:       samba-client >= %{version}
+%if 0%{?suse_version}
+Requires:       pam-config
+%endif
 %if 0%{?suse_version} > 1030
 Recommends:     cron
 Recommends:     logrotate
 Recommends:     samba-krb-printing
 %endif
-PreReq:         /etc/init.d/nscd
+Recommends:     /usr/sbin/nscd
 %if 0%{?suse_version} > 0
 PreReq:         %{?insserv_prereq}
 %endif
@@ -1338,7 +1341,16 @@ fi
 
 %postun winbind
 /sbin/ldconfig
-%{?restart_on_update:%{restart_on_update nscd winbind}}
+%if 0%{?suse_version}
+if [ $1 -eq 0 ]; then
+%{_sbindir}/pam-config --delete --winbind
+if [ -x %{_sbindir}/nscd ]; then
+	%{_sbindir}/nscd -i passwd
+	%{_sbindir}/nscd -i group
+fi
+fi
+%endif
+%{?restart_on_update:%{restart_on_update winbind}}
 %{?insserv_cleanup:%{insserv_cleanup}}
 
 %post -n %{libsmbclient_name} -p /sbin/ldconfig
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 7dbf934..c54a4ce 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:3e7f5508d0ed76334708189099155ef57ff9b0f5bb559b2137726f8e93519385
-size 53389
+oid sha256:7c6a898df9c3cde5b3a644bef75bf5f2b1c813e5c16a9f4a4a0d6432ca869a08
+size 53463