diff --git a/build-source-timestamp b/build-source-timestamp
index b0e08d9..77b910b 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1,2 +1,2 @@
-2315
+2321
 Branch      : trunk
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 204f302..6f1e333 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a524935611d558c166b0840c45681dce0ecba0b3d08746e084be57e2740b022
-size 62616
+oid sha256:686e781b4862c7af79cb122f67b47fa40d3ca70e04d0a727cba7d8144291f204
+size 64736
diff --git a/samba-doc.spec b/samba-doc.spec
index cebe85c..2e50664 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -63,7 +63,7 @@ BuildRequires:  pkgconfig
 %endif
 Url:            http://www.samba.org/
 Version:        3.5.0
-Release:        1
+Release:        2
 License:        GPLv3+
 Summary:        Samba Documentation
 Group:          Documentation/Other
@@ -289,8 +289,8 @@ rm ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.a
 rm -f ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/ldb.pc
 rm -f ${RPM_BUILD_ROOT}/%{_bindir}/ldbtest
 rm -f ${RPM_BUILD_ROOT}/%{py_libdir}/site-packages/ldb.so
-ln -s libldb.so.0.9.3 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so.0
-ln -s libldb.so.0.9.3 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so
+ln -s libldb.so.0.9.7 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so.0
+ln -s libldb.so.0.9.7 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so
 %if %{link_static_libs} == 0
 rm ${RPM_BUILD_ROOT}/%{_libdir}/libldb.a
 %endif
@@ -394,13 +394,13 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %changelog
diff --git a/samba.changes b/samba.changes
index 862ea90..a7ef606 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Mar  8 09:12:07 UTC 2010 - rhafer@novell.com
+
+- Fixed libldb.so link in libldb-devel.
+
+-------------------------------------------------------------------
+Fri Mar  5 15:47:25 UTC 2010 - hhetter@novell.com
+
+- Fix argc handling in net_share, making the command "net share"
+  work again; (bso#7203); (bnc#584253).
+
 -------------------------------------------------------------------
 Mon Mar  1 16:22:52 CET 2010 - lmuelle@suse.de
 
@@ -100,7 +111,7 @@ Fri Feb 19 16:27:03 CET 2010 - lmuelle@suse.de
 Tue Feb  9 22:10:44 UTC 2010 - lmuelle@suse.de
 
 - Take extra care that a mount point of mount.cifs isn't changed during mount
-  and don't allow it to be run as setuid root program; CVE-2009-3638;
+  and don't allow it to be run as setuid root program; CVE-2010-0787;
   (bso#6853); (bnc#550002).
 
 -------------------------------------------------------------------
@@ -109,6 +120,16 @@ Tue Feb  9 17:10:55 UTC 2010 - lmuelle@suse.de
 - Check in mount.cifs for invalid characters in device name and mountpoint;
   CVE-2010-0547; (brc#562156); (bnc#577925).
 
+-------------------------------------------------------------------
+Tue Feb  9 05:00:08 CET 2010 - boyang@suse.de
+
+- Don't invalidate cache for uninitialized domains; (bnc#538923).
+
+-------------------------------------------------------------------
+Tue Feb  9 04:59:09 CET 2010 - boyang@suse.de
+
+- Signals are processed twice in child; (bnc#538923).
+
 -------------------------------------------------------------------
 Mon Feb  8 18:51:27 CET 2010 - jmcdonough@suse.de
 
@@ -194,6 +215,12 @@ Tue Jan 12 22:55:44 UTC 2010 - lmuelle@suse.de
 
 - Free unused memory after a packet got processed; (bso#7020).
 
+-------------------------------------------------------------------
+Fri Jan  8 04:56:21 CET 2010 - boyang@suse.de
+
+- Add timeout to rpc call to prevent infinite loop when network is
+  down; (bnc#538923).
+
 -------------------------------------------------------------------
 Thu Jan  7 12:14:19 UTC 2010 - lmuelle@suse.de
 
@@ -243,6 +270,43 @@ Thu Jan  7 12:14:19 UTC 2010 - lmuelle@suse.de
     query.
   + List trusted domains from wcache when domain is offline.
 
+-------------------------------------------------------------------
+Thu Jan  7 11:21:35 UTC 2010 - lmuelle@suse.de
+
+- Update to 3.4.4.
+  + Fix interdomain trust relationships with Win2008R2 (bug #6697).
+  + Fix Winbind crashes when queried from nss (bug #6889).
+  + Fix Winbind crash when retrieving empty group members (bug #7014).
+  + Fix "UID range full" error in Winbind (bug #6901).
+  + Fix multiple LDAP servers in "idmap backend" and "idmap alloc
+    backend" (bug #6910).
+
+  + BUG 4832: Fix iconv checks.
+  + BUG 6338: Do not always display "none" in 'net rpc trustdom list'.
+  + BUG 6851: Add pdbedit --kickoff-time/-K to set the user's kickoff time.
+  + BUG 6828: Fix infinite timeout when byte lock held outside of samba.
+  + BUG 6837: Fix "Too many open files" message when trying to access a large
+    number of files with Windows 7.
+  + BUG 6841: Fix "map acl inherit = yes".
+  + BUG 6850: Fix shadow copy display on Windows 7.
+  + BUG 6867: Fix listing of directories with a lot of files.
+  + BUG 6868: Support building with Heimdal we well as with MIT.
+  + BUG 6875: Fix DOS attributes on OS/2 clients.
+  + BUG 6880: Fix listing of workgroup servers in libsmbclient.
+  + BUG 6898: Samba duplicates file content on appending.
+  + BUG 6918: Fix krb5 build problem on Ubuntu karmic.
+  + BUG 6929: Fix build with recent heimdal.
+  + BUG 6939: Fix long filenames with "mangling method = hash".
+  + BUG 6967: Fix 'net ads join' with OU.
+  + BUG 6981: Fix paged search with DirX LDAP server.
+  + BUG 6982: Remove erroneous out of memory error path in lookup_sid.
+  + BUG 6997: Fix _samr_GetAliasMembership for results with 0 rids.
+  + BUG 7005: Fix "mangle method = hash" truncates files with dot "."
+    character.
+
+  + Fix the build of the winbind krb5 locator plugin.
+  + Fix enumprinter key client and server.
+
 -------------------------------------------------------------------
 Wed Jan  6 17:17:58 UTC 2010 - lmuelle@suse.de
 
diff --git a/samba.spec b/samba.spec
index 8b0d282..5d29f77 100644
--- a/samba.spec
+++ b/samba.spec
@@ -68,7 +68,7 @@ Group:          Productivity/Networking/Samba
 Url:            http://www.samba.org/
 AutoReqProv:    on
 Version:        3.5.0
-Release:        1
+Release:        2
 %ifarch ppc64
 Obsoletes:      samba-64bit
 %endif
@@ -163,13 +163,13 @@ Authors:
     The Samba Team <samba@samba.org>
 
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %package client
@@ -209,13 +209,13 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@@ -240,13 +240,13 @@ Authors:
     The Samba Team <samba@samba.org>
 
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %endif
@@ -274,13 +274,13 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %endif
@@ -307,13 +307,13 @@ Authors:
 --------
     Jeremy Allison <jra at samba dot org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %if %{make_utils}
@@ -363,13 +363,13 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -394,13 +394,13 @@ PreReq:         /sbin/ldconfig
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 
 %description -n libsmbclient
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %else
@@ -445,13 +445,13 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %package -n libnetapi0
@@ -470,13 +470,13 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %package -n libnetapi-devel
@@ -496,13 +496,13 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -522,13 +522,13 @@ PreReq:         /sbin/ldconfig
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 
 %description -n libsmbsharemodes
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %else
@@ -563,13 +563,13 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %if %{make_ldapsmb}
@@ -590,13 +590,13 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %package -n libtalloc-devel
@@ -616,13 +616,13 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %package -n libtdb1
@@ -641,13 +641,13 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %package -n libtdb-devel
@@ -667,13 +667,13 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %package -n libwbclient0
@@ -692,13 +692,13 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %package -n libwbclient-devel
@@ -718,13 +718,13 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %package -n libtevent0
@@ -743,13 +743,13 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %package -n libtevent-devel
@@ -770,13 +770,13 @@ Authors:
     The Samba Team <samba@samba.org>
 
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %package -n libldb0
@@ -796,13 +796,13 @@ Authors:
     The Samba Team <samba@samba.org>
 
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %package -n libldb-devel
@@ -823,13 +823,13 @@ Authors:
     The Samba Team <samba@samba.org>
 
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %package -n ldapsmb
@@ -838,7 +838,7 @@ Summary:        Tool to administer Samba's LDAP backend
 Group:          Productivity/Networking/Samba
 AutoReqProv:    on
 Version:        1.34b
-Release:        280
+Release:        281
 Requires:       perl-ldap
 
 %description -n ldapsmb
@@ -851,13 +851,13 @@ Authors:
 --------
     Guenther Deschner <guenther at deschner dot de>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %endif
@@ -880,13 +880,13 @@ Authors:
 --------
     Steve French <sfrench at Samba dot org>
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
-Source Timestamp: 2315
+Source Timestamp: 2321
 Branch      : trunk
 
 %endif
@@ -1182,8 +1182,8 @@ rm ${RPM_BUILD_ROOT}/%{_libdir}/libtevent.a
 rm -f ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/ldb.pc
 rm -f ${RPM_BUILD_ROOT}/%{_bindir}/ldbtest
 rm -f ${RPM_BUILD_ROOT}/%{py_libdir}/site-packages/ldb.so
-ln -s libldb.so.0.9.3 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so.0
-ln -s libldb.so.0.9.3 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so
+ln -s libldb.so.0.9.7 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so.0
+ln -s libldb.so.0.9.7 ${RPM_BUILD_ROOT}/%{_libdir}/libldb.so
 %if %{link_static_libs} == 0
 rm ${RPM_BUILD_ROOT}/%{_libdir}/libldb.a
 %endif
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 51d053c..c66e462 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:e22150ccffb67b76a5e5d7ea7a8c0f678d4eaa2f0fbabb750a5bcff6470684c2
-size 24548
+oid sha256:6a650b9d61dcf4e077b46fce4a98372b77a4d326da998312ea387f9523bf5454
+size 24560