diff --git a/build-source-timestamp b/build-source-timestamp
index f937a3b..7ae1362 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1,2 +1,2 @@
-2808
+2809
 Branch      : 3.6.5.PTF
diff --git a/samba-doc.spec b/samba-doc.spec
index d13e127..8c3a63d 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -287,11 +287,9 @@ pushd source3
 %if 0%{?suse_version} && 0%{?suse_version} < 1141
 %{?suse_update_config:%{suse_update_config -f}}
 %endif
-#ln -s m4/aclocal.m4 aclocal.m4
-#autoreconf --force --install -I. -Im4 -I../lib/replace
-%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0
 # Ensure all idl is recompiled, in case we are carrying pidl changes locally.
 rm -f librpc/gen_ndr/*.[cho] ../librpc/gen_ndr/*.[cho]
+%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 && 0%{?fedora_version} < 15 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 && 0%{?suse_version} < 1211
 ./autogen.sh
 %endif
 CONFIGURE_OPTIONS="\
@@ -461,7 +459,7 @@ This package contains all the Samba documentation as it is not part of
 the man pages.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %changelog
diff --git a/samba.changes b/samba.changes
index 77ea081..59f6e95 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun  1 23:01:11 UTC 2012 - lmuelle@suse.com
+
+- Don't call autogen.sh on post-12.1 SUSE and post-14 Fedora systems.
+- Recompile all IDL in any case.
+
 -------------------------------------------------------------------
 Fri Jun  1 14:18:58 UTC 2012 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 81ef00b..b58711c 100644
--- a/samba.spec
+++ b/samba.spec
@@ -221,7 +221,7 @@ binary packages of the most current Samba version, and a bug reporting
 how to.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package client
@@ -262,7 +262,7 @@ binary packages of the most current Samba version, and a bug reporting
 how to.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@@ -282,7 +282,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of Samba.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %endif
@@ -307,7 +307,7 @@ This package contains all the Samba documentation as it is not part of
 the man pages.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %endif
@@ -329,7 +329,7 @@ Requires:       samba-client >= %{version}
 A wrapper binary to run smbspool with the original calling UID.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %if %{make_utils}
@@ -345,7 +345,7 @@ Obsoletes:      samba-gplv3-utils < %{version}
 Some of the debug-tools for developpers.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %endif
@@ -378,7 +378,7 @@ PreReq:         coreutils
 This is the winbind-daemon and the wbinfo-tool.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -404,14 +404,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbclient
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %else
 
 %description -n libsmbclient0
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %endif
@@ -450,7 +450,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the smbclient programming interface.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libnetapi0
@@ -463,7 +463,7 @@ PreReq:         /sbin/ldconfig
 This package includes the netapi library.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libnetapi-devel
@@ -482,7 +482,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the netapi programming interface.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -503,14 +503,14 @@ PreReq:         /sbin/ldconfig
 
 %description -n libsmbsharemodes
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %else
 
 %description -n libsmbsharemodes0
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %endif
@@ -536,7 +536,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the smbsharemodes programming interface.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libwbclient0
@@ -549,7 +549,7 @@ PreReq:         /sbin/ldconfig
 This package includes the wbclient library.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libwbclient-devel
@@ -568,7 +568,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the wbclient programming interface.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1211
@@ -585,7 +585,7 @@ PreReq:         /sbin/ldconfig
 This package includes the talloc library.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libtalloc-devel
@@ -606,7 +606,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the talloc programming interface.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libtdb1
@@ -621,7 +621,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tdb library.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libtdb-devel
@@ -638,7 +638,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the tdb programming interface.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libtevent0
@@ -653,7 +653,7 @@ PreReq:         /sbin/ldconfig
 This package includes the tevent library.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libtevent-devel
@@ -675,7 +675,7 @@ This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libldb1
@@ -691,7 +691,7 @@ PreReq:         /sbin/ldconfig
 This package includes the ldb library.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %package -n libldb-devel
@@ -712,7 +712,7 @@ Requires:       libtalloc-devel
 This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %endif
@@ -732,7 +732,7 @@ This tool aims to simplify the administration of a Samba Domain
 Controller that uses the ldapsam passdb backend.
 
 
-Source Timestamp: 2808
+Source Timestamp: 2809
 Branch      : 3.6.5.PTF
 
 %endif
@@ -833,11 +833,9 @@ pushd source3
 %if 0%{?suse_version} && 0%{?suse_version} < 1141
 %{?suse_update_config:%{suse_update_config -f}}
 %endif
-#ln -s m4/aclocal.m4 aclocal.m4
-#autoreconf --force --install -I. -Im4 -I../lib/replace
-%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0
 # Ensure all idl is recompiled, in case we are carrying pidl changes locally.
 rm -f librpc/gen_ndr/*.[cho] ../librpc/gen_ndr/*.[cho]
+%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 && 0%{?fedora_version} < 15 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 && 0%{?suse_version} < 1211
 ./autogen.sh
 %endif
 CONFIGURE_OPTIONS="\
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 060dc9c..8fd7131 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:d66a6ca57970c1653adef17d5da78c1fb8d134e0b369277722dc870769d8ee90
-size 52518
+oid sha256:e576b416ef26c24de6c601ed89928458973b5421671553dad684a0e8f85ba014
+size 52554