diff -Nru openmpi-1.10.3/debian/changelog openmpi-1.10.3/debian/changelog
--- openmpi-1.10.3/debian/changelog	2016-06-21 12:01:40.000000000 +0000
+++ openmpi-1.10.3/debian/changelog	2016-07-07 10:58:36.000000000 +0000
@@ -1,3 +1,13 @@
+openmpi (1.10.3-3+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 1.6.5-9.1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 26 Nov 2014 23:35:03 +0000]
+  * Modify arm "detection" for raspbian.
+  * Replace dmb with MCR p15, 0, r0, c7, c10, 5 as suggested at 
+    http://www.open-mpi.org/community/lists/devel/2012/02/10626.php
+  * Disable arm64 patch, it conflicts with our modifications to the arm detection patch
+
+ -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Jul 2016 01:58:48 +0000
+
 openmpi (1.10.3-3) unstable; urgency=medium
 
   * Fix libmca_common_verbs 7.0.0 -> 7.0.1
diff -Nru openmpi-1.10.3/debian/patches/raspbian.diff openmpi-1.10.3/debian/patches/raspbian.diff
--- openmpi-1.10.3/debian/patches/raspbian.diff	1970-01-01 00:00:00.000000000 +0000
+++ openmpi-1.10.3/debian/patches/raspbian.diff	2016-07-07 21:42:17.000000000 +0000
@@ -0,0 +1,117 @@
+Index: openmpi-1.10.3/configure
+===================================================================
+--- openmpi-1.10.3.orig/configure
++++ openmpi-1.10.3/configure
+@@ -31369,7 +31369,7 @@ _ACEOF
+             OMPI_GCC_INLINE_ASSIGN='"bis $31,$31,%0" : "=&r"(ret)'
+             ;;
+ 
+-        armv7*|arm-*-linux-gnueabihf)
++        armv7*)
+             ompi_cv_asm_arch="ARM"
+             OPAL_ASM_SUPPORT_64BIT=1
+             OPAL_ASM_ARM_VERSION=7
+@@ -31381,11 +31381,11 @@ _ACEOF
+             OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+             ;;
+ 
+-        armv6*)
++        armv6*|arm-*-linux-gnueabihf)
+             ompi_cv_asm_arch="ARM"
+             OPAL_ASM_SUPPORT_64BIT=0
+             OPAL_ASM_ARM_VERSION=6
+-            CCASFLAGS="$CCASFLAGS -march=armv7-a"
++            CCASFLAGS="$CCASFLAGS"
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define OPAL_ASM_ARM_VERSION $OPAL_ASM_ARM_VERSION
+Index: openmpi-1.10.3/config/opal_config_asm.m4
+===================================================================
+--- openmpi-1.10.3.orig/config/opal_config_asm.m4
++++ openmpi-1.10.3/config/opal_config_asm.m4
+@@ -822,7 +822,7 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
+             OMPI_GCC_INLINE_ASSIGN='"bis [$]31,[$]31,%0" : "=&r"(ret)'
+             ;;
+ 
+-        armv7*|arm-*-linux-gnueabihf)
++        armv7*)
+             ompi_cv_asm_arch="ARM"
+             OPAL_ASM_SUPPORT_64BIT=1
+             OPAL_ASM_ARM_VERSION=7
+@@ -831,11 +831,11 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
+             OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+             ;;
+ 
+-        armv6*)
++        armv6*|arm-*-linux-gnueabihf)
+             ompi_cv_asm_arch="ARM"
+             OPAL_ASM_SUPPORT_64BIT=0
+             OPAL_ASM_ARM_VERSION=6
+-            CCASFLAGS="$CCASFLAGS -march=armv7-a"
++            CCASFLAGS="$CCASFLAGS"
+             AC_DEFINE_UNQUOTED([OPAL_ASM_ARM_VERSION], [$OPAL_ASM_ARM_VERSION],
+                                [What ARM assembly version to use])
+             OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+Index: openmpi-1.10.3/opal/asm/base/ARM.asm
+===================================================================
+--- openmpi-1.10.3.orig/opal/asm/base/ARM.asm
++++ openmpi-1.10.3/opal/asm/base/ARM.asm
+@@ -3,19 +3,19 @@ START_FILE
+ 
+        ALIGN(4)
+ START_FUNC(opal_atomic_mb)
+-       dmb
++       MCR p15, 0, r0, c7, c10, 5
+        bx      lr
+ END_FUNC(opal_atomic_mb)
+ 
+ 
+ START_FUNC(opal_atomic_rmb)
+-       dmb
++       MCR p15, 0, r0, c7, c10, 5
+        bx      lr
+ END_FUNC(opal_atomic_rmb)
+ 
+ 
+ START_FUNC(opal_atomic_wmb)
+-       dmb
++       MCR p15, 0, r0, c7, c10, 5
+        bx      lr
+ END_FUNC(opal_atomic_wmb)
+ 
+@@ -43,7 +43,7 @@ START_FUNC(opal_atomic_cmpset_acq_32)
+        strex   r12, r2, [r0]
+        cmp     r12, #0
+        bne     REFLSYM(3)
+-       dmb
++       MCR p15, 0, r0, c7, c10, 5
+        mov     r0, #1
+        LSYM(4)
+        movne   r0, #0
+@@ -56,7 +56,7 @@ START_FUNC(opal_atomic_cmpset_rel_32)
+        ldrex   r3, [r0]
+        cmp     r1, r3
+        bne     REFLSYM(6)
+-       dmb
++       MCR p15, 0, r0, c7, c10, 5
+        strex   r12, r2, [r0]
+        cmp     r12, #0
+        bne     REFLSYM(4)
+@@ -98,7 +98,7 @@ START_FUNC(opal_atomic_cmpset_acq_64)
+        strexd  r1, r6, r7, [r0]
+        cmp     r1, #0
+        bne     REFLSYM(9)
+-       dmb
++       MCR p15, 0, r0, c7, c10, 5
+        mov     r0, #1
+        LSYM(10)
+        movne   r0, #0
+@@ -116,7 +116,7 @@ START_FUNC(opal_atomic_cmpset_rel_64)
+        it      eq
+        cmpeq   r5, r3
+        bne     REFLSYM(12)
+-       dmb
++       MCR p15, 0, r0, c7, c10, 5
+        strexd  r1, r6, r7, [r0]
+        cmp     r1, #0
+        bne     REFLSYM(11)
diff -Nru openmpi-1.10.3/debian/patches/series openmpi-1.10.3/debian/patches/series
--- openmpi-1.10.3/debian/patches/series	2016-06-17 12:10:57.000000000 +0000
+++ openmpi-1.10.3/debian/patches/series	2016-07-07 10:59:36.000000000 +0000
@@ -2,9 +2,9 @@
 manpage_macros
 arm_detection.diff
 mips-detection.diff
-basic-arm64-support.diff
 alpha_badatomic.patch
 hppa.patch
 reproducible-build.patch
 fix-man-pages.patch
 x32.patch
+raspbian.diff