diff -Nru fpc-3.0.2+dfsg/debian/changelog fpc-3.0.2+dfsg/debian/changelog
--- fpc-3.0.2+dfsg/debian/changelog	2017-08-07 17:00:17.000000000 +0000
+++ fpc-3.0.2+dfsg/debian/changelog	2017-08-24 15:25:31.000000000 +0000
@@ -1,3 +1,10 @@
+fpc (3.0.2+dfsg-5+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 2.6.4+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 20 Oct 2014 23:12:17 +0000]
+  * Set compiler defaults for raspbian.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 24 Aug 2017 15:25:31 +0000
+
 fpc (3.0.2+dfsg-5) unstable; urgency=medium
 
   * Drop kfreebsd patches for now, resurrect them from git when required
diff -Nru fpc-3.0.2+dfsg/debian/patches/raspbian.diff fpc-3.0.2+dfsg/debian/patches/raspbian.diff
--- fpc-3.0.2+dfsg/debian/patches/raspbian.diff	1970-01-01 00:00:00.000000000 +0000
+++ fpc-3.0.2+dfsg/debian/patches/raspbian.diff	2017-08-24 15:25:28.000000000 +0000
@@ -0,0 +1,56 @@
+Description: Change compiler defaults for raspbian
+ We need armv6 and vfpv2 rather than armv7 and vfpv3-d16
+Author: Peter Michael Green <plugwash@debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: fpc-3.0.0+dfsg/fpcsrc/compiler/options.pas
+===================================================================
+--- fpc-3.0.0+dfsg.orig/fpcsrc/compiler/options.pas
++++ fpc-3.0.0+dfsg/fpcsrc/compiler/options.pas
+@@ -3692,7 +3692,8 @@ begin
+     begin
+       if not(option.FPUSetExplicitly) then
+         begin
+-          init_settings.fputype:=fpu_vfpv3_d16
++          //RPI -- reduce default fpu to vfpv2
++          init_settings.fputype:=fpu_vfpv2
+         end
+       else
+         begin
+@@ -3729,10 +3730,9 @@ begin
+       end;
+   end;
+ 
+-{ set default cpu type to ARMv7a for ARMHF unless specified otherwise }
++{ set default cpu type to ARMv6 for Raspbian unless specified otherwise }
+ if (target_info.abi = abi_eabihf) then
+   begin
+-{$ifdef CPUARMV6}
+     { if the compiler is built for armv6, then
+       inherit this setting, e.g. Raspian is armhf but
+       only armv6, this makes rebuilds of the compiler
+@@ -3741,12 +3741,6 @@ if (target_info.abi = abi_eabihf) then
+       init_settings.cputype:=cpu_armv6;
+     if not option.OptCPUSetExplicitly then
+       init_settings.optimizecputype:=cpu_armv6;
+-{$else CPUARMV6}
+-    if not option.CPUSetExplicitly then
+-      init_settings.cputype:=cpu_armv7a;
+-    if not option.OptCPUSetExplicitly then
+-      init_settings.optimizecputype:=cpu_armv7a;
+-{$endif CPUARMV6}
+   end;
+ 
+   if (init_settings.instructionset=is_thumb) and not(CPUARM_HAS_THUMB2 in cpu_capabilities[init_settings.cputype]) then
diff -Nru fpc-3.0.2+dfsg/debian/patches/series fpc-3.0.2+dfsg/debian/patches/series
--- fpc-3.0.2+dfsg/debian/patches/series	2017-08-07 17:00:17.000000000 +0000
+++ fpc-3.0.2+dfsg/debian/patches/series	2017-08-24 15:25:31.000000000 +0000
@@ -25,3 +25,4 @@
 fix-spelling-errors-3.patch
 fix_tests_for_make_print_directory.patch
 fix_mips_mipsel_lazarus_FTBFS.patch
+raspbian.diff
diff -Nru fpc-3.0.2+dfsg/debian/source/timestamps fpc-3.0.2+dfsg/debian/source/timestamps
--- fpc-3.0.2+dfsg/debian/source/timestamps	2017-07-09 13:03:41.000000000 +0000
+++ fpc-3.0.2+dfsg/debian/source/timestamps	2017-08-24 15:25:31.000000000 +0000
@@ -153,7 +153,6 @@
 fpcsrc/rtl/arm/arm.inc 2017-02-24T10:42+00:00
 fpcsrc/rtl/arm/thumb2.inc 2017-02-24T10:42+00:00
 fpcsrc/rtl/bsd/ostypes.inc 2017-02-24T10:42+00:00
-fpcsrc/rtl/bsd/sysos.inc 2017-02-24T10:42+00:00
 fpcsrc/rtl/darwin/aarch64/sig_cpu.inc 2017-02-24T10:42+00:00
 fpcsrc/rtl/darwin/aarch64/sighnd.inc 2017-02-24T10:42+00:00
 fpcsrc/rtl/darwin/extres_multiarch.inc 2017-02-24T10:42+00:00
@@ -185,7 +184,6 @@
 fpcsrc/rtl/unix/cthreads.pp 2017-02-24T10:42+00:00
 fpcsrc/rtl/unix/cwstring.pp 2017-02-24T10:42+00:00
 fpcsrc/rtl/unix/dl.pp 2017-02-24T10:42+00:00
-fpcsrc/rtl/unix/initc.pp 2017-02-24T10:42+00:00
 fpcsrc/rtl/unix/timezone.inc 2017-02-24T10:42+00:00
 fpcsrc/utils/fpcm/fpcmmain.pp 2017-02-24T10:42+00:00
 fpcsrc/utils/fpcm/fpcmwr.pp 2017-02-24T10:42+00:00