diff -Nru fpc-2.6.4+dfsg/debian/changelog fpc-2.6.4+dfsg/debian/changelog
--- fpc-2.6.4+dfsg/debian/changelog	2015-08-14 11:18:44.000000000 +0000
+++ fpc-2.6.4+dfsg/debian/changelog	2015-09-09 22:51:30.000000000 +0000
@@ -1,3 +1,10 @@
+fpc (2.6.4+dfsg-8+rpi1) stretch-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>  Wed, 09 Sep 2015 22:51:29 +0000
+
 fpc (2.6.4+dfsg-8) unstable; urgency=medium
 
   * Fix FTBFS, I missed two dependencies of fpgtk removed in the
diff -Nru fpc-2.6.4+dfsg/debian/patches/raspbian.diff fpc-2.6.4+dfsg/debian/patches/raspbian.diff
--- fpc-2.6.4+dfsg/debian/patches/raspbian.diff	1970-01-01 00:00:00.000000000 +0000
+++ fpc-2.6.4+dfsg/debian/patches/raspbian.diff	2015-09-09 22:51:30.000000000 +0000
@@ -0,0 +1,45 @@
+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-2.6.2/fpcsrc/compiler/options.pas
+===================================================================
+--- fpc-2.6.2.orig/fpcsrc/compiler/options.pas	2014-01-19 01:09:19.000000000 +0000
++++ fpc-2.6.2/fpcsrc/compiler/options.pas	2014-01-19 01:09:19.000000000 +0000
+@@ -3036,7 +3036,8 @@
+     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
+@@ -3062,10 +3063,11 @@
+ { set default cpu type to ARMv7 for ARMHF unless specified otherwise }
+ if (target_info.abi = abi_eabihf) then
+   begin
++    // RPI - reduce default CPU to armv6
+     if not option.CPUSetExplicitly then
+-      init_settings.cputype:=cpu_armv7;
++      init_settings.cputype:=cpu_armv6;
+     if not option.OptCPUSetExplicitly then
+-      init_settings.optimizecputype:=cpu_armv7;
++      init_settings.optimizecputype:=cpu_armv6;
+   end;
+ 
+ {$endif arm}
diff -Nru fpc-2.6.4+dfsg/debian/patches/series fpc-2.6.4+dfsg/debian/patches/series
--- fpc-2.6.4+dfsg/debian/patches/series	2015-08-10 11:22:25.000000000 +0000
+++ fpc-2.6.4+dfsg/debian/patches/series	2015-09-09 22:51:30.000000000 +0000
@@ -20,3 +20,4 @@
 prevent_date_in_fpcdocs.patch
 create_fpmkunitsrc.inc_in_right_folder.patch
 disable_building_gnome1_and_gtk1.patch
+raspbian.diff