diff --git a/.abf.yml b/.abf.yml
index f3b640d..f754270 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,4 @@
 sources:
+  samba-4.6.9.tar.asc: a451e6d8fecd25d7408117f9a9eeb9590e26768d
+  samba-4.6.9.tar.gz: 7adf48bad6a654d42cb148f450787f455d55a2ff
   samba-pubkey.asc: 7a27a6974cc0ec939d50fcb1591aa754c4b4b0bf
-  samba-4.6.8.tar.gz: 744fa10e3ad8ea7219e51c27f3792d99e25782be
-  samba-4.6.8.tar.asc: 1aa4f123877f31a98b103ee7756b5d64d1b28b64
diff --git a/samba-4.3.6-autofree.patch b/samba-4.3.6-autofree.patch
deleted file mode 100644
index d052f4c..0000000
--- a/samba-4.3.6-autofree.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 7cc7b3e575381e1ff83660332cc4f3ef0d2bcd1e Mon Sep 17 00:00:00 2001
-From: Volker Lendecke <vl at samba.org>
-Date: Fri, 4 Mar 2016 10:51:33 +0100
-Subject: [PATCH] pdb_ldap: Don't use autofree if "mods" still changes
-
-This will prevent some use-after-free's, potentially it might for example fix
-bugzilla 11851. Not directly related, but it's a crash related to ldap-backed
-user creation.
-
-Signed-off-by: Volker Lendecke <vl at samba.org>
----
- source3/passdb/pdb_ldap.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
-index 50ab3a7..4383785 100644
---- a/source3/passdb/pdb_ldap.c
-+++ b/source3/passdb/pdb_ldap.c
-@@ -5291,10 +5291,10 @@ static NTSTATUS ldapsam_create_user(struct pdb_methods *my_methods,
-    }
- 
-    init_okay = init_ldap_from_sam(ldap_state, entry, &mods, user, pdb_element_is_set_or_changed);
--	smbldap_talloc_autofree_ldapmod(tmp_ctx, mods);
- 
-    if (!init_okay) {
-	DEBUG(1,("ldapsam_create_user: Unable to fill user structs\n"));
-+		ldap_mods_free(mods, true);
-	return NT_STATUS_UNSUCCESSFUL;
-    }
- 
-@@ -5312,12 +5312,14 @@ static NTSTATUS ldapsam_create_user(struct pdb_methods *my_methods,
-	if (!sid_compose(&group_sid, get_global_sam_sid(), DOMAIN_RID_USERS) ||
-	    !sid_to_gid(&group_sid, &gid)) {
-	    DEBUG (0, ("ldapsam_create_user: Unable to get the Domain Users gid: bailing out!\n"));
-+			ldap_mods_free(mods, true);
-	    return NT_STATUS_INVALID_PRIMARY_GROUP;
-	}
- 
-	/* lets allocate a new userid for this user */
-	if (!winbind_allocate_uid(&uid)) {
-	    DEBUG (0, ("ldapsam_create_user: Unable to allocate a new user id: bailing out!\n"));
-+			ldap_mods_free(mods, true);
-	    return NT_STATUS_UNSUCCESSFUL;
-	}
- 
-@@ -5354,6 +5356,7 @@ static NTSTATUS ldapsam_create_user(struct pdb_methods *my_methods,
-	escape_name = escape_rdn_val_string_alloc(name);
-	if (!escape_name) {
-	    DEBUG (0, ("ldapsam_create_user: Out of memory!\n"));
-+			ldap_mods_free(mods, true);
-	    return NT_STATUS_NO_MEMORY;
-	}
- 
-@@ -5367,6 +5370,7 @@ static NTSTATUS ldapsam_create_user(struct pdb_methods *my_methods,
- 
-	if (!homedir || !shell || !uidstr || !gidstr || !dn) {
-	    DEBUG (0, ("ldapsam_create_user: Out of memory!\n"));
-+			ldap_mods_free(mods, true);
-	    return NT_STATUS_NO_MEMORY;
-	}
- 
-@@ -5385,6 +5389,8 @@ static NTSTATUS ldapsam_create_user(struct pdb_methods *my_methods,
-	rc = smbldap_modify(ldap_state->smbldap_state, dn, mods);
-    }	
- 
-+	ldap_mods_free(mods, true);
-+
-    if (rc != LDAP_SUCCESS) {
-	DEBUG(0,("ldapsam_create_user: failed to create a new user [%s] (dn = %s)\n", name ,dn));
-	return NT_STATUS_UNSUCCESSFUL;
--- 
-2.1.4
diff --git a/samba.rpmlintrc b/samba.rpmlintrc
index 632d2fa..3526ff4 100644
--- a/samba.rpmlintrc
+++ b/samba.rpmlintrc
@@ -7,3 +7,4 @@ addFilter("tag-not-utf8")
 addFilter("devel-file-in-non-devel-package")
 # "invalid" (unversioned) sonames on files that are dlopen-ed
 addFilter("invalid-soname")
+addFilter("W: no-documentation")
diff --git a/samba.spec b/samba.spec
index 5c34fe1..2af7d3e 100644
--- a/samba.spec
+++ b/samba.spec
@@ -88,7 +88,7 @@
 
 Summary:	Samba SMB server
 Name:		samba
-Version:	4.6.8
+Version:	4.6.9
 Release:	1
 Epoch:		1
 License:	GPLv3+
@@ -113,7 +113,6 @@ Source41:	openldap-samba.conf
 Source100:	%{name}.rpmlintrc
 # xdr_* functions have moved from glibc into libtirpc
 Patch0:		samba-4.3.9-tirpc.patch
-Patch1:		samba-4.3.6-autofree.patch
 Patch2:		samba-4.3.11-winbind-service.patch
 
 # Required for ldb docs