diff -Nru ffcall-2.1/debian/changelog ffcall-2.1/debian/changelog
--- ffcall-2.1/debian/changelog	2018-02-17 20:30:10.000000000 +0000
+++ ffcall-2.1/debian/changelog	2018-03-01 16:23:45.000000000 +0000
@@ -1,3 +1,12 @@
+ffcall (2.1-1+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 2.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 07 Dec 2017 01:23:49 +0000]
+  * Replace movw/movt with ldr psuedo instruction.
+  * Mark binaries as armv6 not armv7
+  * Disable testsuite, it fails on some of our buildboxes.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Mar 2018 16:23:45 +0000
+
 ffcall (2.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru ffcall-2.1/debian/patches/raspbian.patch ffcall-2.1/debian/patches/raspbian.patch
--- ffcall-2.1/debian/patches/raspbian.patch	1970-01-01 00:00:00.000000000 +0000
+++ ffcall-2.1/debian/patches/raspbian.patch	2018-03-01 16:23:45.000000000 +0000
@@ -0,0 +1,83 @@
+Description: ffcall changes for raspbian.
+   * Replace movw/movt with ldr psuedo instruction.
+   * Mark binaries as armv6 not armv7
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- ffcall-2.1.orig/avcall/avcall-armhf-macro.S
++++ ffcall-2.1/avcall/avcall-armhf-macro.S
+@@ -1,5 +1,5 @@
+ #include "asm-arm.h"
+-	.arch armv7-a
++	.arch armv6
+ 	.eabi_attribute 28, 1
+ 	.eabi_attribute 20, 1
+ 	.eabi_attribute 21, 1
+@@ -15,7 +15,7 @@
+ 	.global C(avcall_call)
+ 	.syntax unified
+ 	.arm
+-	.fpu vfpv3-d16
++	.fpu vfpv2
+ 	.type	avcall_call, %function
+ FUNBEGIN(avcall_call)
+ 	// args = 0, pretend = 0, frame = 0
+--- ffcall-2.1.orig/callback/vacall_r/vacall-armhf-macro.S
++++ ffcall-2.1/callback/vacall_r/vacall-armhf-macro.S
+@@ -1,5 +1,5 @@
+ #include "asm-arm.h"
+-	.arch armv7-a
++	.arch armv6
+ 	.eabi_attribute 28, 1
+ 	.eabi_attribute 20, 1
+ 	.eabi_attribute 21, 1
+@@ -15,7 +15,7 @@
+ 	.global C(callback_receiver)
+ 	.syntax unified
+ 	.arm
+-	.fpu vfpv3-d16
++	.fpu vfpv2
+ 	.type	callback_receiver, %function
+ FUNBEGIN(callback_receiver)
+ 	// args = 28, pretend = 0, frame = 176
+--- ffcall-2.1.orig/vacall/vacall-armhf-macro.S
++++ ffcall-2.1/vacall/vacall-armhf-macro.S
+@@ -1,6 +1,6 @@
+ #include "asm-arm.h"
+ #ifdef __PIC__
+-	.arch armv7-a
++	.arch armv6
+ 	.eabi_attribute 28, 1
+ 	.eabi_attribute 20, 1
+ 	.eabi_attribute 21, 1
+@@ -150,7 +150,7 @@ L(31):
+ 	.word	C(vacall_function)(GOT)
+ 	FUNEND(vacall_receiver)
+ #else
+-	.arch armv7-a
++	.arch armv6
+ 	.eabi_attribute 28, 1
+ 	.eabi_attribute 20, 1
+ 	.eabi_attribute 21, 1
+@@ -166,7 +166,7 @@ L(31):
+ 	.global C(vacall_receiver)
+ 	.syntax unified
+ 	.arm
+-	.fpu vfpv3-d16
++	.fpu vfpv2
+ 	.type	vacall_receiver, %function
+ FUNBEGIN(vacall_receiver)
+ 	// args = 20, pretend = 16, frame = 176
+@@ -176,8 +176,11 @@ FUNBEGIN(vacall_receiver)
+ 	push	{r4, r5, fp, lr}
+ 	add	fp, sp, $12
+ 	add	lr, fp, $4
+-	movw	r4, $:lower16:C(vacall_function)
+-	movt	r4, $:upper16:C(vacall_function)
++	#raspbian mod, replace movw/movt with ldr psuedo-instruction
++	#movw	r4, $:lower16:C(vacall_function)
++	#movt	r4, $:upper16:C(vacall_function)
++	ldr r4, =C(vacall_function)
++	#end raspbian mod.
+ 	sub	sp, sp, $176
+ 	add	r5, fp, $20
+ 	stm	lr, {r0, r1, r2, r3}
diff -Nru ffcall-2.1/debian/patches/series ffcall-2.1/debian/patches/series
--- ffcall-2.1/debian/patches/series	2018-02-17 20:08:26.000000000 +0000
+++ ffcall-2.1/debian/patches/series	2018-03-01 16:23:45.000000000 +0000
@@ -1 +1,2 @@
 mips-fpxx.patch
+raspbian.patch
diff -Nru ffcall-2.1/debian/rules ffcall-2.1/debian/rules
--- ffcall-2.1/debian/rules	2018-02-17 20:30:10.000000000 +0000
+++ ffcall-2.1/debian/rules	2018-03-01 16:23:45.000000000 +0000
@@ -6,3 +6,6 @@
 
 %:
 	dh $@ --no-parallel
+
+override_dh_auto_test:
+	echo testsuite disabled.