diff --git a/openldap-segfault-ldif-indent.patch b/openldap-segfault-ldif-indent.patch
new file mode 100644
index 0000000..f7ee4d0
--- /dev/null
+++ b/openldap-segfault-ldif-indent.patch
@@ -0,0 +1,19 @@
+Segmentation fault of client tool when input LDIF line is splitted but not indented correctly.
+
+Resolves: #716855
+Author: Howard Chu <hyc@openldap.org>
+Upstream: ITS#6978, git 4b057bc
+
+diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
+index 7cd9774..2d11045 100644
+--- a/clients/tools/ldapmodify.c
++++ b/clients/tools/ldapmodify.c
+@@ -449,7 +449,7 @@ process_ldif_rec( char *rbuf, int linenum )
+ 			fprintf( stderr, _("%s: invalid format (line %d) entry: \"%s\"\n"),
+ 				prog, linenum+i, dn == NULL ? "" : dn );
+ 			rc = LDAP_PARAM_ERROR;
+-			break;
++			goto leave;
+ 		}
+ 		freeval[i] = freev;
+ 
diff --git a/openldap.spec b/openldap.spec
index 045cb8f..c0c790d 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -30,6 +30,7 @@ Patch7: openldap-userconfig-setgid.patch
 Patch8: openldap-nss-nofork.patch
 Patch9: openldap-nss-cacertdir-soft-error.patch
 Patch10: openldap-ldapexop-double-free.patch
+Patch11: openldap-segfault-ldif-indent.patch
 
 # patches for the evolution library (see README.evolution)
 Patch200: openldap-evolution-ntlm.patch
@@ -132,6 +133,7 @@ pushd openldap-%{version}
 %patch8 -p1 -b .nss-nofork
 %patch9 -p1 -b .nss-cacertdir-soft-error
 %patch10 -p1 -b .ldapexop-double-free
+%patch11 -p1 -b .segfault-ldif-indent
 
 cp %{_datadir}/libtool/config/config.{sub,guess} build/
 
@@ -663,6 +665,8 @@ exit 0
 - fix: connection fails if TLS_CACERTDIR doesn't exist but TLS_REQCERT
   is set to 'never' (#716854)
 - fix: segmentation fault caused by double-free in ldapexop (#699683)
+- fix: segmentation fault of client tool when input line in LDIF file
+  is splitted but indented incorrectly (#716855)
 
 * Fri Mar 18 2011 Jan Vcelak <jvcelak@redhat.com> 2.4.24-2
 - new: system resource limiting for slapd using ulimit