diff -Nru octave-3.6.2/debian/changelog octave-3.6.2/debian/changelog
--- octave-3.6.2/debian/changelog	2012-07-30 11:13:40.000000000 -0400
+++ octave-3.6.2/debian/changelog	2012-08-18 12:39:20.000000000 -0400
@@ -1,3 +1,12 @@
+octave (3.6.2-5) unstable; urgency=low
+
+  * Make liboctave-dev coinstallable again with all HDF5 variants
+    + Now depends on libhdf5-dev | libhdf5-openmpi-dev | libhdf5-mpich2-dev
+    + mkoctfile-mpi.diff: patch reintroduced back; includes MPI headers when
+      compiling with mkoctfile (see #598227)
+
+ -- Sébastien Villemot <sebastien.villemot@ens.fr>  Sat, 18 Aug 2012 16:35:11 +0000
+
 octave (3.6.2-4) unstable; urgency=low
 
   [ Mike Miller ]
diff -Nru octave-3.6.2/debian/control octave-3.6.2/debian/control
--- octave-3.6.2/debian/control	2012-07-21 12:20:35.000000000 -0400
+++ octave-3.6.2/debian/control	2012-08-09 05:34:36.000000000 -0400
@@ -126,7 +126,8 @@
 Architecture: any
 Depends: liboctave1 (= ${binary:Version}), octave (= ${binary:Version}), ${misc:Depends},
  libreadline-dev | libreadline6-dev | libreadline5-dev, libncurses5-dev,
- libhdf5-dev (>= 1.8.8), libgl1-mesa-dev | libgl-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++
 Conflicts: octave3.2-headers
 Replaces: octave3.2-headers
diff -Nru octave-3.6.2/debian/patches/mkoctfile-mpi.diff octave-3.6.2/debian/patches/mkoctfile-mpi.diff
--- octave-3.6.2/debian/patches/mkoctfile-mpi.diff	1969-12-31 19:00:00.000000000 -0500
+++ octave-3.6.2/debian/patches/mkoctfile-mpi.diff	2012-08-18 12:30:50.000000000 -0400
@@ -0,0 +1,18 @@
+Description: Include MPI headers when building Oct/MEX-files
+Author: Thomas Weber <tweber@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598227
+Forwarded: not-needed
+Last-Update: 2012-08-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/mkoctfile.in
++++ b/src/mkoctfile.in
+@@ -77,7 +77,7 @@
+ : ${CXXFLAGS=%OCTAVE_CONF_CXXFLAGS%}
+ : ${CXXPICFLAG=%OCTAVE_CONF_CXXPICFLAG%}
+ : ${XTRA_CFLAGS=%OCTAVE_CONF_XTRA_CFLAGS%}
+-: ${XTRA_CXXFLAGS=%OCTAVE_CONF_XTRA_CXXFLAGS%}
++: ${XTRA_CXXFLAGS=-I/usr/include/mpi %OCTAVE_CONF_XTRA_CXXFLAGS%}
+ 
+ : ${DEPEND_FLAGS=%OCTAVE_CONF_DEPEND_FLAGS%}
+ : ${DEPEND_EXTRA_SED_PATTERN=%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%}
diff -Nru octave-3.6.2/debian/patches/series octave-3.6.2/debian/patches/series
--- octave-3.6.2/debian/patches/series	2012-06-01 05:57:15.000000000 -0400
+++ octave-3.6.2/debian/patches/series	2012-08-18 12:33:02.000000000 -0400
@@ -7,3 +7,4 @@
 correct_typos
 use_system_gl2ps
 drop_version_from_mkoctfile_function_call
+mkoctfile-mpi.diff