diff --git a/samba-4.2-fix-rpc-helper.patch b/samba-4.2-fix-rpc-helper.patch
new file mode 100644
index 0000000..52d1533
--- /dev/null
+++ b/samba-4.2-fix-rpc-helper.patch
@@ -0,0 +1,34 @@
+commit 1ff9ffea061e4bdecea65749d8d0e3c082e25d77
+Author:     Günther Deschner <gd@samba.org>
+AuthorDate: Thu Apr 30 11:20:58 2015 +0200
+Commit:     Günther Deschner <gd@samba.org>
+CommitDate: Thu Apr 30 11:22:26 2015 +0200
+
+    s3-rpc_server: fix rpc_create_tcpip_sockets() processing of interfaces.
+    
+    We were supplying an empty value for the "host" binding string option, causing
+    dcerpc_binding_vector_add_port() call to fail.
+
+    Fixes: https://bugzilla.samba.org/show_bug.cgi?id=11245    
+    Guenther
+    
+    Signed-off-by: Günther Deschner <gd@samba.org>
+    Pair-Programmed-With: Alexander Bokovoy <ab@samba.org>
+---
+ source3/rpc_server/rpc_sock_helper.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/rpc_server/rpc_sock_helper.c b/source3/rpc_server/rpc_sock_helper.c
+index 8f371b8..7aced63 100644
+--- a/source3/rpc_server/rpc_sock_helper.c
++++ b/source3/rpc_server/rpc_sock_helper.c
+@@ -138,7 +138,7 @@ NTSTATUS rpc_create_tcpip_sockets(const struct ndr_interface_table *iface,
+ 			if (bvec != NULL) {
+ 				status = dcerpc_binding_vector_add_port(iface,
+ 									bvec,
+-									sock_ptr,
++									sock_tok,
+ 									p);
+ 				if (!NT_STATUS_IS_OK(status)) {
+ 					close(fd);
+
diff --git a/samba.spec b/samba.spec
index dc04bc8..ae2ddd7 100644
--- a/samba.spec
+++ b/samba.spec
@@ -6,7 +6,7 @@
 # ctdb is enabled by default, you can disable it with: --without clustering
 %bcond_without clustering
 
-%define main_release 6
+%define main_release 7
 
 %define samba_version 4.2.1
 %define talloc_version 2.1.2
@@ -94,6 +94,7 @@ Source0:        samba-%{version}%{pre_release}.tar.xz
 
 Patch0:         samba-4.2.2-fix_debug_macro.patch
 Patch1:         samba-4.2.2-lib-util-fix-detection-of-systemd-libraries.patch
+Patch2:         samba-4.2-fix-rpc-helper.patch
 
 # Red Hat specific replacement-files
 Source1: samba.log
@@ -644,6 +645,7 @@ and use CTDB instead.
 
 %patch0 -p1 -b .samba-4.2.2-fix_debug_macro.patch
 %patch1 -p1 -b .samba-4.2.2-lib-util-fix-detection-of-systemd-libraries.patch
+%patch2 -p1 -b .samba-4.2-fix-rpc-helper.patch
 
 %build
 %global _talloc_lib ,talloc,pytalloc,pytalloc-util
@@ -1932,6 +1934,10 @@ rm -rf %{buildroot}
 %endif # with_clustering_support
 
 %changelog
+* Thu Apr 30 2015 Alexander Bokovoy <abokovoy@redhat.com> - 4.2.1-7
+- Fix LSASD daemon
+- resolves: #1217346 - FreeIPA trusts to AD broken due to Samba 4.2 failure to run LSARPC pipe externally
+
 * Mon Apr 27 2015 Alexander Bokovoy <abokovoy@redhat.com> - 4.2.1-6
 - Remove samba-common-tools from samba-client package as it brings back Python 2.7