diff -Nru octave-3.6.4/debian/changelog octave-3.6.4/debian/changelog
--- octave-3.6.4/debian/changelog	2013-08-15 12:12:46.000000000 +0000
+++ octave-3.6.4/debian/changelog	2013-09-08 02:24:54.000000000 +0000
@@ -1,3 +1,16 @@
+octave (3.6.4-4+rpi2) jessie-staging; urgency=low
+
+  * Make liboctave-dev depend on gcc/g++ 4.8 as building with that compiler
+    has effectively made liboctave-dev dependent on it.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 08 Sep 2013 02:24:16 +0000
+
+octave (3.6.4-4+rpi1) jessie-staging; urgency=low
+
+  * Build with gcc/g++ 4.8 to avoid ICE.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 05 Sep 2013 20:00:26 +0000
+
 octave (3.6.4-4) unstable; urgency=low
 
   [ Rafael Laboissiere ]
diff -Nru octave-3.6.4/debian/control octave-3.6.4/debian/control
--- octave-3.6.4/debian/control	2013-07-26 14:49:44.000000000 +0000
+++ octave-3.6.4/debian/control	2013-09-08 08:50:34.000000000 +0000
@@ -14,7 +14,7 @@
  libqhull-dev, desktop-file-utils, libfltk1.3-dev, libgl2ps-dev,
  libgraphicsmagick++1-dev, libftgl-dev, libfontconfig1-dev,
  libqrupdate-dev, libarpack2-dev (>= 2.1+parpack96.dfsg-2), dh-exec,
- dpkg-dev (>= 1.16.1)
+ dpkg-dev (>= 1.16.1), gcc-4.8, g++-4.8
 Standards-Version: 3.9.4
 Homepage: http://www.octave.org/
 Vcs-Git: git://anonscm.debian.org/pkg-octave/octave.git
@@ -129,7 +129,8 @@
  libreadline-dev | libreadline6-dev | libreadline5-dev, libncurses5-dev,
  libhdf5-dev (>= 1.8.8) | libhdf5-openmpi-dev (>= 1.8.8) | libhdf5-mpich2-dev (>= 1.8.8),
  libgl1-mesa-dev | libgl-dev,
- libblas-dev (>=1.2-7), liblapack-dev (>=3.2.1-7), libfftw3-dev, gfortran, gcc, g++
+ libblas-dev (>=1.2-7), liblapack-dev (>=3.2.1-7), libfftw3-dev, gfortran, gcc, g++,
+ gcc-4.8, g++-4.8
 Conflicts: octave3.2-headers
 Replaces: octave3.2-headers
 Section: libdevel
diff -Nru octave-3.6.4/debian/rules octave-3.6.4/debian/rules
--- octave-3.6.4/debian/rules	2013-07-26 14:49:44.000000000 +0000
+++ octave-3.6.4/debian/rules	2013-09-05 20:00:23.000000000 +0000
@@ -1,6 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+# Use gcc/gcc 4.8
+export CC=gcc-4.8
+export CXX=g++-4.8
+
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1