diff -Nru dolfin-1.3.0+dfsg/debian/changelog dolfin-1.3.0+dfsg/debian/changelog
--- dolfin-1.3.0+dfsg/debian/changelog	2014-02-14 10:18:32.000000000 +0000
+++ dolfin-1.3.0+dfsg/debian/changelog	2014-02-23 23:43:30.000000000 +0000
@@ -1,3 +1,12 @@
+dolfin (1.3.0+dfsg-1+rpi1) jessie-staging; urgency=medium
+
+  * Use gcc/g++ 4.6 on armhf and mips due to address space
+    exhaustion issues with 4.8 and 4.7 (Closes: 739697)
+  * Include stdint.h in Logger.cpp to workaround boost
+    header.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 23 Feb 2014 23:41:16 +0000
+
 dolfin (1.3.0+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru dolfin-1.3.0+dfsg/debian/control dolfin-1.3.0+dfsg/debian/control
--- dolfin-1.3.0+dfsg/debian/control	2014-02-14 10:17:52.000000000 +0000
+++ dolfin-1.3.0+dfsg/debian/control	2014-02-23 04:51:43.000000000 +0000
@@ -33,7 +33,9 @@
  libvtk5-qt4-dev,
  libqt4-dev,
  python-ply,
- libeigen3-dev
+ libeigen3-dev,
+ gcc-4.6 [armhf mips],
+ g++-4.6 [armhf mips]
 Standards-Version: 3.9.5
 X-Python-Version: >= 2.5
 Homepage: http://fenicsproject.org
diff -Nru dolfin-1.3.0+dfsg/debian/patches/series dolfin-1.3.0+dfsg/debian/patches/series
--- dolfin-1.3.0+dfsg/debian/patches/series	2014-02-14 10:17:52.000000000 +0000
+++ dolfin-1.3.0+dfsg/debian/patches/series	2014-02-23 14:19:32.000000000 +0000
@@ -1 +1,2 @@
 CSGCGALMeshGenerator3D-oom.patch
+workaround-boost-error.patch
diff -Nru dolfin-1.3.0+dfsg/debian/patches/workaround-boost-error.patch dolfin-1.3.0+dfsg/debian/patches/workaround-boost-error.patch
--- dolfin-1.3.0+dfsg/debian/patches/workaround-boost-error.patch	1970-01-01 00:00:00.000000000 +0000
+++ dolfin-1.3.0+dfsg/debian/patches/workaround-boost-error.patch	2014-02-23 14:22:12.000000000 +0000
@@ -0,0 +1,40 @@
+Description: Workaround compile error with boost by including stdint.h
+ I got a build failure with the error
+ 
+ In file included from /usr/include/boost/atomic.hpp:12:0,
+                  from /usr/include/boost/thread/pthread/once_atomic.hpp:20,
+                  from /usr/include/boost/thread/once.hpp:20,
+                  from /usr/include/boost/thread.hpp:17,
+                  from /dolfin-1.3.0+dfsg/dolfin/log/Logger.cpp:32:
+ /usr/include/boost/atomic/atomic.hpp:202:16: error: ‘uintptr_t’ was not declared in this scope
+ /usr/include/boost/atomic/atomic.hpp:202:25: error: template argument 1 is invalid
+ /usr/include/boost/atomic/atomic.hpp:202:43: error: invalid type in declaration before ‘;’ token
+ 
+ From some googling it seemed the workaround was to include stdint.h before
+ including the boost headers, so I did that.
+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>
+
+--- dolfin-1.3.0+dfsg.orig/dolfin/log/Logger.cpp
++++ dolfin-1.3.0+dfsg/dolfin/log/Logger.cpp
+@@ -29,6 +29,8 @@
+ #include <stdexcept>
+ #include <string>
+ 
++#include <stdint.h>
++
+ #include <boost/thread.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/date_time/posix_time/posix_time.hpp>
diff -Nru dolfin-1.3.0+dfsg/debian/rules dolfin-1.3.0+dfsg/debian/rules
--- dolfin-1.3.0+dfsg/debian/rules	2014-02-14 10:17:52.000000000 +0000
+++ dolfin-1.3.0+dfsg/debian/rules	2014-02-23 04:49:57.000000000 +0000
@@ -9,6 +9,16 @@
 # Allow test programs that uses OpenMPI to run
 export OMPI_MCA_plm_rsh_agent=/bin/false
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifeq ($(DEB_HOST_ARCH),armhf)
+  export CC=gcc-4.6
+  export CXX=g++-4.6
+endif
+ifeq ($(DEB_HOST_ARCH),mips)
+  export CC=gcc-4.6
+  export CXX=g++-4.6
+endif
+
 # Disable MPI on lam architectures
 ifeq ($(DEB_BUILD_ARCH), armel)
 ENABLE_MPI=OFF