diff -Nru fpc-2.6.0/debian/changelog fpc-2.6.0/debian/changelog
--- fpc-2.6.0/debian/changelog	2012-05-06 22:46:11.000000000 +0100
+++ fpc-2.6.0/debian/changelog	2012-05-13 10:29:06.000000000 +0100
@@ -1,3 +1,9 @@
+fpc (2.6.0-3+rpi1) unstable; urgency=low
+  *  Change compiler defaults for Pi
+
+ -- Peter Michael Green <plugwash@debian.org>  Sat, 21 Apr 2012 13:13:00 +0100
+
+
 fpc (2.6.0-3) unstable; urgency=low
   * Add myself to uploaders
   * Add support for armhf (Closes: Bug#666264)
diff -Nru fpc-2.6.0/debian/control fpc-2.6.0/debian/control
--- fpc-2.6.0/debian/control	2012-05-06 22:45:30.000000000 +0100
+++ fpc-2.6.0/debian/control	2012-05-13 10:41:16.000000000 +0100
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Carlos Laviola <claviola@debian.org>
-Uploaders: Torsten Werner <twerner@debian.org>, Abou Al Montacir <abou.almontacir@sfr.fr>, Peter Michael Green <plugwash@debian.org>
+Uploaders: Torsten Werner <twerner@debian.org>, Abou Al Montacir <abou.almontacir@sfr.fr>
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 7), fp-compiler, fp-units-base, fp-units-fcl, fp-utils, mawk | awk, libncurses-dev, binutils, ghostscript
diff -Nru fpc-2.6.0/debian/patches/raspbian.diff fpc-2.6.0/debian/patches/raspbian.diff
--- fpc-2.6.0/debian/patches/raspbian.diff	1970-01-01 01:00:00.000000000 +0100
+++ fpc-2.6.0/debian/patches/raspbian.diff	2012-05-13 10:37:58.000000000 +0100
@@ -0,0 +1,43 @@
+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>
+
+--- fpc-2.6.0.orig/fpcsrc/compiler/options.pas
++++ fpc-2.6.0/fpcsrc/compiler/options.pas
+@@ -2832,7 +2832,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
+@@ -2858,10 +2859,11 @@ if (target_info.system=system_arm_darwin
+ { 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.0/debian/patches/series fpc-2.6.0/debian/patches/series
--- fpc-2.6.0/debian/patches/series	2012-05-06 22:35:21.000000000 +0100
+++ fpc-2.6.0/debian/patches/series	2012-05-13 10:37:01.000000000 +0100
@@ -3,3 +3,4 @@
 regenerate_messages.diff
 fix-FPCDIR-in-fpcmake.diff
 armhf-linker-path.diff
+raspbian.diff