diff -u openldap-2.4.31/debian/changelog openldap-2.4.31/debian/changelog
--- openldap-2.4.31/debian/changelog
+++ openldap-2.4.31/debian/changelog
@@ -1,3 +1,11 @@
+openldap (2.4.31-1+nmu2ubuntu8.3) trusty; urgency=medium
+
+  * Fix segfault issue in slap_bv2ad (LP: #1593378)
+    - d/p/its-7941-fix-for-repeated-tags.patch: Cherry picked
+    patch from upstream VCS.
+
+ -- Eric Desrochers <eric.desrochers@canonical.com>  Fri, 17 Jun 2016 10:12:48 -0400
+
 openldap (2.4.31-1+nmu2ubuntu8.2) trusty-security; urgency=medium
 
   * SECURITY UPDATE: denial of service via crafted BER data
diff -u openldap-2.4.31/debian/patches/series openldap-2.4.31/debian/patches/series
--- openldap-2.4.31/debian/patches/series
+++ openldap-2.4.31/debian/patches/series
@@ -29,0 +30 @@
+its-7941-fix-for-repeated-tags.patch
only in patch2:
unchanged:
--- openldap-2.4.31.orig/debian/patches/its-7941-fix-for-repeated-tags.patch
+++ openldap-2.4.31/debian/patches/its-7941-fix-for-repeated-tags.patch
@@ -0,0 +1,16 @@
+Description: ITS#7941 fix for repeated tags
+Make sure ntags isn't incremented if we're skipping the tag
+Author: Howard Chu <hyc@openldap.org>
+Origin: http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=commitdiff;h=af8f1e0
+Bug-Ubuntu: https://launchpad.net/bugs/1593378
+---
+--- a/servers/slapd/ad.c
++++ b/servers/slapd/ad.c
+@@ -271,6 +271,7 @@
+ 
+ 				if( rc == 0 && (unsigned)optlen == tags[i].bv_len ) {
+ 					/* duplicate (ignore) */
++					ntags--;
+ 					goto done;
+ 
+ 				} else if ( rc > 0 ||