diff --git a/.cvsignore b/.cvsignore
index 8a5d58d..ec762c2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-samba-3.2.11.tar.gz
+samba-3.2.12.tar.gz
diff --git a/samba-3.2.11-force_user.patch b/samba-3.2.11-force_user.patch
deleted file mode 100644
index d5d3293..0000000
--- a/samba-3.2.11-force_user.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
-index 24b05a5..175a234 100644
---- a/source/auth/auth_util.c
-+++ b/source/auth/auth_util.c
-@@ -867,6 +867,33 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
- 		*found_username = talloc_strdup(mem_ctx,
- 						pdb_get_username(sam_acct));
- 
-+		/*
-+		 * If the SID from lookup_name() was the guest sid, passdb knows
-+		 * about the mapping of guest sid to lp_guestaccount()
-+		 * username and will return the unix_pw info for a guest
-+		 * user. Use it if it's there, else lookup the *uid details
-+		 * using getpwnam_alloc(). See bug #6291 for details. JRA.
-+		 */
-+
-+		/* We must always assign the *uid. */
-+		if (sam_acct->unix_pw == NULL) {
-+			struct passwd *pwd = getpwnam_alloc(sam_acct, *found_username );
-+			if (!pwd) {
-+				DEBUG(10, ("getpwnam_alloc failed for %s\n",
-+					*found_username));
-+				result = NT_STATUS_NO_SUCH_USER;
-+				goto done;
-+			}
-+			result = samu_set_unix(sam_acct, pwd );
-+			if (!NT_STATUS_IS_OK(result)) {
-+				DEBUG(10, ("samu_set_unix failed for %s\n",
-+					*found_username));
-+				result = NT_STATUS_NO_SUCH_USER;
-+				goto done;
-+			}
-+		}
-+		*uid = sam_acct->unix_pw->pw_uid;
-+
- 	} else 	if (sid_check_is_in_unix_users(&user_sid)) {
- 
- 		/* This is a unix user not in passdb. We need to ask nss
-@@ -883,8 +910,9 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
- 	unix_user:
- 
- 		if (!sid_to_uid(&user_sid, uid)) {
--			DEBUG(1, ("sid_to_uid for %s (%s) failed\n",
-+			DEBUG(1, ("unix_user case, sid_to_uid for %s (%s) failed\n",
- 				  username, sid_string_dbg(&user_sid)));
-+			result = NT_STATUS_NO_SUCH_USER;
- 			goto done;
- 		}
- 
-@@ -937,6 +965,14 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
- 
- 		uint32 dummy;
- 
-+		/* We must always assign the *uid. */
-+		if (!sid_to_uid(&user_sid, uid)) {
-+			DEBUG(1, ("winbindd case, sid_to_uid for %s (%s) failed\n",
-+				  username, sid_string_dbg(&user_sid)));
-+			result = NT_STATUS_NO_SUCH_USER;
-+			goto done;
-+		}
-+
- 		num_group_sids = 1;
- 		group_sids = TALLOC_ARRAY(tmp_ctx, DOM_SID, num_group_sids);
- 		if (group_sids == NULL) {
diff --git a/samba.spec b/samba.spec
index 361e8b0..289fc40 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,5 +1,5 @@
-%define main_release 29
-%define samba_version 3.2.11
+%define main_release 30
+%define samba_version 3.2.12
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
@@ -8,7 +8,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.2.11
+Version: 3.2.12
 Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
@@ -46,7 +46,6 @@ Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
-Patch201: samba-3.2.11-force_user.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -253,7 +252,6 @@ cp %{SOURCE11} packaging/Fedora/
 #%patch110 -p1 -b .smbspool # FIXME: does not apply
 #%patch111 -p1 -b .smbclient # FIXME: does not apply
 #%patch200 -p0 -b .inotify # FIXME: does not compile
-%patch201 -p1 -b .force_user
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < source/VERSION.orig > source/VERSION
@@ -826,6 +824,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Tue Jun 16 2009 Guenther Deschner <gdeschner@redhat.com> - 3.2.12-0.30
+- Update to 3.2.12
+
 * Tue Apr 28 2009 Guenther Deschner <gdeschner@redhat.com> - 3.2.11-0.29
 - Fix "force user"
 - resolves: #497708
diff --git a/sources b/sources
index 3c371f7..287c800 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc514bc92184b9b64544afa457e4d84e  samba-3.2.11.tar.gz
+6f76e4d1e914f06ea9cac4aeccc43619  samba-3.2.12.tar.gz