diff -Nru openmpi-1.6.5/debian/changelog openmpi-1.6.5/debian/changelog
--- openmpi-1.6.5/debian/changelog	2013-09-14 16:55:20.000000000 +0000
+++ openmpi-1.6.5/debian/changelog	2013-11-28 00:00:41.000000000 +0000
@@ -1,3 +1,9 @@
+openmpi (1.6.5-5+rpi1) jessie-staging; urgency=low
+
+  * Modify arm "detection" for raspbian.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 28 Nov 2013 00:00:31 +0000
+
 openmpi (1.6.5-5) unstable; urgency=low
 
   * Fix the incorrect symlink in libopenmpi1.6 (Closes: #722888)
diff -Nru openmpi-1.6.5/debian/patches/arm_detection.diff openmpi-1.6.5/debian/patches/arm_detection.diff
--- openmpi-1.6.5/debian/patches/arm_detection.diff	2013-07-01 07:47:26.000000000 +0000
+++ openmpi-1.6.5/debian/patches/arm_detection.diff	2013-11-28 00:00:48.000000000 +0000
@@ -1,16 +1,16 @@
 Index: openmpi-1.6.5/opal/config/opal_config_asm.m4
 ===================================================================
---- openmpi-1.6.5.orig/opal/config/opal_config_asm.m4	2013-07-01 09:47:08.000000000 +0200
-+++ openmpi-1.6.5/opal/config/opal_config_asm.m4	2013-07-01 09:47:07.000000000 +0200
-@@ -900,7 +900,7 @@
-             OMPI_GCC_INLINE_ASSIGN='"bis [$]31,[$]31,%0" : "=&r"(ret)'
+--- openmpi-1.6.5.orig/opal/config/opal_config_asm.m4	2013-11-27 23:59:03.000000000 +0000
++++ openmpi-1.6.5/opal/config/opal_config_asm.m4	2013-11-27 23:59:42.000000000 +0000
+@@ -909,7 +909,7 @@
+             OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
              ;;
  
--        armv7*)
-+        armv7*|arm-*-linux-gnueabihf)
+-        armv6*)
++        armv6*|arm-*-linux-gnueabihf)
              ompi_cv_asm_arch="ARM"
-             OPAL_ASM_SUPPORT_64BIT=1
-             OPAL_ASM_ARM_VERSION=7
+             OPAL_ASM_SUPPORT_64BIT=0
+             OPAL_ASM_ARM_VERSION=6
 @@ -919,7 +919,7 @@
              OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
              ;;
@@ -22,17 +22,17 @@
              OPAL_ASM_SUPPORT_64BIT=0
 Index: openmpi-1.6.5/configure
 ===================================================================
---- openmpi-1.6.5.orig/configure	2013-07-01 09:47:08.000000000 +0200
-+++ openmpi-1.6.5/configure	2013-07-01 09:47:08.000000000 +0200
-@@ -27192,7 +27192,7 @@
-             OMPI_GCC_INLINE_ASSIGN='"bis $31,$31,%0" : "=&r"(ret)'
+--- openmpi-1.6.5.orig/configure	2013-11-27 23:59:03.000000000 +0000
++++ openmpi-1.6.5/configure	2013-11-28 00:00:10.000000000 +0000
+@@ -27204,7 +27204,7 @@
+             OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
              ;;
  
--        armv7*)
-+        armv7*|arm-*-linux-gnueabihf)
+-        armv6*)
++        armv6*|arm-*-linux-gnueabihf)
              ompi_cv_asm_arch="ARM"
-             OPAL_ASM_SUPPORT_64BIT=1
-             OPAL_ASM_ARM_VERSION=7
+             OPAL_ASM_SUPPORT_64BIT=0
+             OPAL_ASM_ARM_VERSION=6
 @@ -27217,7 +27217,7 @@
              OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
              ;;