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+nmu2ubuntu6) trusty; urgency=low
+
+  * Fix segfault issue with master-master syncrepl (LP: #1287730):
+    - d/patches/its-7354-fix-delta-sync-mmr.diff: Cherry picked
+      patch from upstream VCS.
+
+ -- Pierre Fersing <pfersing@sierrawireless.com>  Tue, 04 Mar 2014 16:04:57 +0100
+
 openldap (2.4.31-1+nmu2ubuntu5) trusty; urgency=low
 
   * Build-depend on libdb5.3-dev, instead of libdb5.1-dev.
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
@@ -25,0 +26 @@
+its-7354-fix-delta-sync-mmr.diff
only in patch2:
unchanged:
--- openldap-2.4.31.orig/debian/patches/its-7354-fix-delta-sync-mmr.diff
+++ openldap-2.4.31/debian/patches/its-7354-fix-delta-sync-mmr.diff
@@ -0,0 +1,24 @@
+From 3f71f756013a61b6a3cf7c529e1ec42675f5e040 Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc@openldap.org>
+Date: Thu, 16 Aug 2012 18:08:56 -0700
+Subject: [PATCH] ITS#7354 fix delta-sync mmr crash
+
+---
+ servers/slapd/syncrepl.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
+index 76ba66e..7c07b90 100644
+--- a/servers/slapd/syncrepl.c
++++ b/servers/slapd/syncrepl.c
+@@ -1962,6 +1962,7 @@ drop:
+ 				}
+ 			}
+ 			slap_mods_free( newmods, 1 );
++			rx->rx_mods = oldmods;
+ 		}
+ 	}
+ 	return LDAP_SUCCESS;
+-- 
+1.7.4.2
+