diff -Nru openmpi-3.1.0/debian/changelog openmpi-3.1.0/debian/changelog
--- openmpi-3.1.0/debian/changelog	2018-05-28 18:46:30.000000000 +0000
+++ openmpi-3.1.0/debian/changelog	2018-06-03 23:43:50.000000000 +0000
@@ -1,3 +1,11 @@
+openmpi (3.1.0-6+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 2.1.1-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 05 Jul 2017 00:52:53 +0000]
+  * Modify arm "detection" for Raspbian.
+  * Partially fix clean target
+
+ -- Raspbian forward porter <root@raspbian.org>  Sun, 03 Jun 2018 23:43:50 +0000
+
 openmpi (3.1.0-6) unstable; urgency=medium
 
   * Dump libtool on FTBFS for debugging
diff -Nru openmpi-3.1.0/debian/patches/raspbian.diff openmpi-3.1.0/debian/patches/raspbian.diff
--- openmpi-3.1.0/debian/patches/raspbian.diff	1970-01-01 00:00:00.000000000 +0000
+++ openmpi-3.1.0/debian/patches/raspbian.diff	2018-06-03 23:43:50.000000000 +0000
@@ -0,0 +1,28 @@
+Description: Modify arm "detection" for Raspbian.
+
+Index: openmpi-2.1.1.try3/config/opal_config_asm.m4
+===================================================================
+--- openmpi-2.1.1.try3.orig/config/opal_config_asm.m4
++++ openmpi-2.1.1.try3/config/opal_config_asm.m4
+@@ -1037,7 +1037,7 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
+             OPAL_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+             ;;
+ 
+-        armv7*|arm-*-linux-gnueabihf)
++        armv7*)
+             opal_cv_asm_arch="ARM"
+             OPAL_ASM_SUPPORT_64BIT=1
+             OPAL_ASM_ARM_VERSION=7
+@@ -1046,11 +1046,10 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
+             OPAL_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
+             ;;
+ 
+-        armv6*)
++        armv6*|arm-*-linux-gnueabihf)
+             opal_cv_asm_arch="ARM"
+             OPAL_ASM_SUPPORT_64BIT=0
+             OPAL_ASM_ARM_VERSION=6
+-            CCASFLAGS="$CCASFLAGS -march=armv7-a"
+             AC_DEFINE_UNQUOTED([OPAL_ASM_ARM_VERSION], [$OPAL_ASM_ARM_VERSION],
+                                [What ARM assembly version to use])
+             OPAL_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
diff -Nru openmpi-3.1.0/debian/patches/series openmpi-3.1.0/debian/patches/series
--- openmpi-3.1.0/debian/patches/series	2018-05-28 18:46:30.000000000 +0000
+++ openmpi-3.1.0/debian/patches/series	2018-06-03 23:43:50.000000000 +0000
@@ -10,3 +10,4 @@
 verbose-ompi-rules.patch
 openjdk10.patch
 fix-underlinking.patch
+raspbian.diff
diff -Nru openmpi-3.1.0/debian/rules openmpi-3.1.0/debian/rules
--- openmpi-3.1.0/debian/rules	2018-05-28 18:46:30.000000000 +0000
+++ openmpi-3.1.0/debian/rules	2018-06-03 23:43:50.000000000 +0000
@@ -75,6 +75,12 @@
 	find . -type l -delete
 	find . -name '*.o' -delete
 	rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
+	rm -f `find test/ -type f ! -name '*.*' ! -name 'run_tests'`
+	rm -f `find . -name '*.a'`
+	rm -f `find . -name '*.class'`
+	rm -f `find . -name '*.mod'`
+	rm -f `find . -name '*.jar'`
+	rm -f `find orte/tools/ -type f ! -name '*.*'`
 
 override_dh_update_autotools_config:
 	(cd config && autom4te --language=m4sh opal_get_version.m4sh -o opal_get_version.sh)